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

Steinar H. Gunderson sesse at costa.debian.org
Fri Jan 6 02:10:19 UTC 2006


Author: sesse
Date: 2006-01-06 02:10:18 +0000 (Fri, 06 Jan 2006)
New Revision: 908

Modified:
   branches/samba4/samba.postinst
Log:
Don't read stuff from debconf, use vorlon's sed insanity from the
Samba 3 packaging to grok smb.conf instead. :-)


Modified: branches/samba4/samba.postinst
===================================================================
--- branches/samba4/samba.postinst	2006-01-06 02:07:23 UTC (rev 907)
+++ branches/samba4/samba.postinst	2006-01-06 02:10:18 UTC (rev 908)
@@ -4,6 +4,28 @@
 
 . /usr/share/debconf/confmodule
 
+# Function for grabbing a parameter from an smb.conf file
+smbconf_retr() {
+	if [ -z "$1" ]; then
+		return
+	fi
+
+	if [ -n "$2" ]; then
+		local FILE="$2"
+	fi
+
+	if [ -z "$FILE" ]; then
+		return
+	fi
+
+	sed -n -e"
+		s/^[[:space:]]*\[global\]/\[global\]/i
+		/^\[global\]/,/^[[:space:]]*\[/ {
+			s/^[[:space:]]*$1[[:space:]]*=[[:space:]]*//pi
+		}" $FILE \
+	| tail -n 1
+}
+
 if [ "$1" = "configure" ]; then
 	# See if we're upgrading from Samba 3
 	if [ ! -z "$2" ]; then
@@ -25,12 +47,9 @@
 				mv /etc/samba/smb.conf.new /etc/samba/smb.conf
 			fi
 
-			db_get samba-common/realm || true
-			REALM="$RET"
+			REALM=$( smbconf_retr realm )
+			DOMAIN=$( smbconf_retr workgroup )
 
-			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




More information about the Pkg-samba-maint mailing list