[Pkg-samba-maint] r3672 - trunk/samba/debian

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2011-02-12 17:36:32 +0000 (Sat, 12 Feb 2011)
New Revision: 3672

Modified:
   trunk/samba/debian/samba-common.dhcp
Log:
Really so the following:
Only try parsing dhcpd.conf is it's not empty,
in dhclient-enter-hooks.d/samba
(partial fix for #594088)


Modified: trunk/samba/debian/samba-common.dhcp
===================================================================
--- trunk/samba/debian/samba-common.dhcp	2011-02-12 17:25:31 UTC (rev 3671)
+++ trunk/samba/debian/samba-common.dhcp	2011-02-12 17:36:32 UTC (rev 3672)
@@ -20,7 +20,7 @@
 
 	# the destination file won't exist yet on the first run after 
 	# installing samba
-	if [ -e $SAMBA_DHCP_CONF ]
+	if [ -e $SAMBA_DHCP_CONF ] && [ -s $SAMBA_DHCP_CONF ]
 	then
 		# don't continue if no settings have changed
 		if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \