[Pkg-samba-maint] Bug#647523: samba-common: /etc/samba/dhcp.conf remains empty when it shouldn't

[Bert Burgemeister]

Package: samba-common
Version: 2:3.5.6~dfsg-3squeeze5
Severity: normal
Tags: patch


/etc/samba/dhcp.conf should contain a "wins server = foo" line that is
made of the dhcp netbios-name-servers response, but it is created
empty instead.

Here is a patch that fixes the problem (for me):

--- /etc/dhcp3/dhclient-enter-hooks.d/samba-original    2011-07-27 08:55:45.000000000 +0200
+++ /etc/dhcp3/dhclient-enter-hooks.d/samba             2011-11-03 15:11:57.000000000 +0100
@@ -20,7 +20,7 @@

        # the destination file won't exist yet on the first run after
        # installing samba
-       if [ -e $SAMBA_DHCP_CONF ]
+       if [ -s $SAMBA_DHCP_CONF ]
        then
                # don't continue if no settings have changed
                  if [ "$new_netbios_name_servers" = "$old_netbios_name_servers" ] \




-- System Information:
Debian Release: 6.0.3
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages samba-common depends on:
ii  debconf [debconf-2.0]        1.5.36.1    Debian configuration management sy
ii  ucf                          3.0025+nmu1 Update Configuration File: preserv

Versions of packages samba-common recommends:
ii  samba-common-bin  2:3.5.6~dfsg-3squeeze5 common files used by both the Samb

samba-common suggests no packages.

-- Configuration Files:
/etc/dhcp3/dhclient-enter-hooks.d/samba changed [not included]

-- debconf information:
* samba-common/encrypt_passwords: true
* samba-common/dhcp: true
* samba-common/workgroup: WORKGROUP
  samba-common/do_debconf: true