[Pkg-samba-maint] [samba] 01/01: Fix database errors during upgrade. Closes: #700768

[Jelmer Vernooij]

This is an automated email from the git hooks/post-receive script.

jelmer pushed a commit to branch samba_4.0
in repository samba.

commit 988a0127dc15eca61fcf544d4540daac6ee5835c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Aug 17 19:39:54 2013 +0000

    Fix database errors during upgrade. Closes: #700768
---
 debian/changelog            |    1 +
 debian/samba-ad-dc.postinst |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index fba2a64..7a84aad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ samba (2:4.0.8+dfsg-2) UNRELEASED; urgency=low
   * samba-ad-dc: Drop suggests for removed packages swat2 and samba-gtk.
   * samba: Remove inetd servers from suggests; inetd support was dropped
     in 3.6.16-1.
+  * Fix database errors during upgrade. Closes: #700768
 
  -- Steve Langasek <vorlon at debian.org>  Fri, 16 Aug 2013 02:00:12 +0200
 
diff --git a/debian/samba-ad-dc.postinst b/debian/samba-ad-dc.postinst
index 8157535..1f8921f 100644
--- a/debian/samba-ad-dc.postinst
+++ b/debian/samba-ad-dc.postinst
@@ -37,7 +37,7 @@ if [ "$1" = "configure" -a "$SERVER_ROLE" != "none" ]; then
 	elif [ -e /var/lib/samba/private/sam.ldb ]; then
 		# Upgrade from previous Samba 4 installation
 		if [ -f /etc/samba/smb.conf ]; then
-			samba-tool dbcheck
+			samba-tool dbcheck --fix --yes
 		fi
 	fi
 	# Provision from scratch if we need to

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git