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

[Christian Perrier]

Author: bubulle
Date: 2007-04-24 12:52:47 +0000 (Tue, 24 Apr 2007)
New Revision: 1338

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba-common.dhcp
Log:
/etc/dhcp3/dhclient-enter-hooks.d/samba tests for /etc/init.d/samba
before running invoke-rc.d


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-04-24 09:54:38 UTC (rev 1337)
+++ trunk/samba/debian/changelog	2007-04-24 12:52:47 UTC (rev 1338)
@@ -10,7 +10,7 @@
       Closes: #231229
     - all occurrences of "encypt" fixed in smb.conf(5)
       Closes: #408507
-    - two typos on "account" fixed in source/passdb/pdb_ldap.c and 
+    - two typos on "account" fixed in source/passdb/pdb_ldap.c and
       source/utils/pdbedit.c. Closes: #402392
     - no longer panic when using the (deprecated) "only user" option
       in user level security. Closes: #388282
@@ -20,8 +20,12 @@
   * Esperanto added. Closes: #417795.
   * Basque updated. Closes: #418196.
 
- -- Steve Langasek <vorlon at debian.org>  Sat, 07 Apr 2007 15:34:46 -0700
+  [ Christian Perrier ]
+  * /etc/dhcp3/dhclient-enter-hooks.d/samba tests for /etc/init.d/samba
+    before running invoke-rc.d. Closes: #414841
 
+ -- Christian Perrier <bubulle at debian.org>  Tue, 24 Apr 2007 14:51:09 +0200
+
 samba (3.0.24-6) unstable; urgency=high
 
   * Arrrgh, cut'n'paste error in the regexp in the last upload, so the bug

Modified: trunk/samba/debian/samba-common.dhcp
===================================================================
--- trunk/samba/debian/samba-common.dhcp	2007-04-24 09:54:38 UTC (rev 1337)
+++ trunk/samba/debian/samba-common.dhcp	2007-04-24 12:52:47 UTC (rev 1338)
@@ -65,7 +65,8 @@
 	mv ${SAMBA_DHCP_CONF}.new $SAMBA_DHCP_CONF
 
 	# reload the samba server
-	/usr/sbin/invoke-rc.d samba reload
+	# We don't necessarily have the samba package installed. #414841
+	[ -x /etc/init.d/samba ] && /usr/sbin/invoke-rc.d samba reload
 
 }