trying to get HEAD building again. If you want the code

prior to this merge, checkout HEAD_PRE_3_0_0_BETA_3_MERGE
(This used to be commit adb98e7b7cd0f025b52c570e4034eebf4047b1ad)

1 files changed, 29 insertions, 24 deletions

diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp
index 0ec8a0ff80..3b2fa4ba19 100644
--- a/packaging/Debian/debian/samba-common.dhcp
+++ b/packaging/Debian/debian/samba-common.dhcp
@@ -1,29 +1,34 @@
 #!/bin/sh
 
-# No need to continue if we're called with an unsupported option
+netbios_setup() {
+	# No need to continue if we're called with an unsupported option
 
-if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
-   && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
-   && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
-then
-	exit 0
-fi
+	if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
+	   && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
+	   && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
+	then
+		return
+	fi
 
-umask 022
+	umask 022
 
-if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \
-   || [ "$reason" = EXPIRE ]
-then
-	# FIXME: add sed magic to only remove wins servers
-	# associated with this interface
-	echo -n > /etc/samba/dhcp.conf
-elif [ "$new_netbios_name_servers" != "old_netbios_name_servers" ]
-then
-	for server in $new_netbios_name_servers
-	do
-		serverlist="$serverlist $interface:$server"
-	done
-	# FIXME: add sed magic to only update wins servers
-	# associated with this interface
-	echo "   wins server =$serverlist" > /etc/samba/dhcp.conf
-fi
+	if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \
+	   || [ "$reason" = EXPIRE ]
+	then
+		# FIXME: add sed magic to only remove wins servers
+		# associated with this interface
+		echo -n > /etc/samba/dhcp.conf
+	elif [ "$new_netbios_name_servers" != "$old_netbios_name_servers" ]
+	then
+		local serverlist=""
+		for server in $new_netbios_name_servers
+		do
+			serverlist="$serverlist $interface:$server"
+		done
+		# FIXME: add sed magic to only update wins servers
+		# associated with this interface
+		echo "   wins server =$serverlist" > /etc/samba/dhcp.conf
+	fi
+}
+
+netbios_setup