Author: Lars Mueller <lmuelle at SuSE dot de>
Subject: DCHP hook enhancement
Bugzilla: bugzilla.Samba.org #2056

--- samba-3.0.6/packaging/Debian/debian-unstable/samba-common.dhcp
+++ samba-3.0.6/packaging/Debian/debian-unstable/samba-common.dhcp	2004-08-26 17:40:49
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 SAMBA_DHCP_CONF=/etc/samba/dhcp.conf
+SAMBA_DHCP_CONF_INFO_FILE=""
 
 netbios_setup() {
 	# No need to continue if we're called with an unsupported option
@@ -14,7 +14,8 @@
 
 	# Nor should we continue if no settings have changed
 	if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \
-	   && [ "$new_netbios_scope" = "$old_netbios_scope" ]
+	   && [ "$new_netbios_scope" = "$old_netbios_scope" ] \
+	   && [ -f $SAMBA_DHCP_CONF ]
 	then
 		return
 	fi
@@ -33,6 +35,8 @@
 	done
 
 	echo -n > $SAMBA_DHCP_CONF
+	test -n "$SAMBA_DHCP_CONF_INFO_FILE" -a -f "$SAMBA_DHCP_CONF_INFO_FILE" && \
+		cat "$SAMBA_DHCP_CONF_INFO_FILE" >> $SAMBA_DHCP_CONF
 
 	# If we're updating on failure/expire, AND there are no WINS
 	# servers for other interfaces, leave the file empty.