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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2010-04-10 06:12:39 +0000 (Sat, 10 Apr 2010)
New Revision: 3428

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.if-up
Log:
allow "NetworkManager" as a recognized address family... it's
obviously /not/ an address family, but it's what gets sent when using
NM, so we'll cope for now.	


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2010-04-10 05:49:22 UTC (rev 3427)
+++ trunk/samba/debian/changelog	2010-04-10 06:12:39 UTC (rev 3428)
@@ -15,6 +15,9 @@
   * debian/samba.if-up, debian/rules: add an if-up.d script for samba to
     try to start nmbd, if it's not running because /etc/init.d/samba ran
     before the network was up at boot time.  Closes: #576415, LP: #462169.
+  * debian/samba.if-up: allow "NetworkManager" as a recognized address
+    family... it's obviously /not/ an address family, but it's what gets
+    sent when using NM, so we'll cope for now.
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 24 Mar 2010 22:02:25 +0100
 

Modified: trunk/samba/debian/samba.if-up
===================================================================
--- trunk/samba/debian/samba.if-up	2010-04-10 05:49:22 UTC (rev 3427)
+++ trunk/samba/debian/samba.if-up	2010-04-10 06:12:39 UTC (rev 3428)
@@ -13,9 +13,13 @@
 
 # Samba only cares about inet and inet6. Get thee gone, strange people
 # still using ipx.
-if [ "$ADDRFAM" != inet ] && [ "$ADDRFAM" != inet6 ]; then
-	exit 0
-fi
+case $ADDRFAM in
+	inet|inet6|NetworkManager)
+		;;
+	*)
+		exit 0
+		;;
+esac
 
 status=$(/etc/init.d/samba status)