[Pkg-samba-maint] r905 - branches/samba4

[Steinar H. Gunderson]

Author: sesse
Date: 2006-01-06 01:51:59 +0000 (Fri, 06 Jan 2006)
New Revision: 905

Modified:
   branches/samba4/samba.postinst
Log:
Fetch domain and realm from debconf, as we can't fetch them easily from
smb.conf ATM (testparm is broken), and provision won't find them by itself.


Modified: branches/samba4/samba.postinst
===================================================================
--- branches/samba4/samba.postinst	2006-01-06 01:28:57 UTC (rev 904)
+++ branches/samba4/samba.postinst	2006-01-06 01:51:59 UTC (rev 905)
@@ -12,12 +12,10 @@
 			if [ "$RET" = "true" ]; then
 				mv /etc/samba/smb.conf /etc/samba/smb.conf.samba3
 				/usr/lib/samba/setup/upgrade /var/lib/samba /etc/samba/smb.conf.samba3
-				db_stop
 			fi
 		fi
 	else
 		db_get samba/setup-pdc || true
-		db_stop
 
 		if [ "$RET" = "true" ]; then
 			# add "server role = pdc" to [globals]
@@ -27,12 +25,19 @@
 				mv /etc/samba/smb.conf.new /etc/samba/smb.conf
 			fi
 
-			/usr/lib/samba/setup/provision
+			db_get samba-common/realm || true
+			REALM="$RET"
+
+			db_get samba-common/domain || true
+			DOMAIN="$RET"
+
+			if [ -n "$REALM" -a -n "$DOMAIN" ]; then
+				/usr/lib/samba/setup/provision --realm="$REALM" --domain="$DOMAIN"
+			fi
 		fi
 	fi
-else
-	db_stop
 fi
+db_stop
 
 #DEBHELPER#