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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2009-03-01 03:19:04 +0000 (Sun, 01 Mar 2009)
New Revision: 2620

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/samba.postinst
Log:
When populating the sambashare group, it's not an error if the user
simply doesn't exist; test for this case and let the install continue
instead of aborting.  LP: #206036.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-03-01 03:05:53 UTC (rev 2619)
+++ trunk/samba/debian/changelog	2009-03-01 03:19:04 UTC (rev 2620)
@@ -12,6 +12,9 @@
 
   [ Steve Langasek ]
   * Add Vcs-{Browser,Svn} fields to debian/control.
+  * When populating the sambashare group, it's not an error if the user
+    simply doesn't exist; test for this case and let the install continue
+    instead of aborting.  LP: #206036.
 
  -- Christian Perrier <bubulle at debian.org>  Wed, 25 Feb 2009 17:34:26 +0100
 

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2009-03-01 03:05:53 UTC (rev 2619)
+++ trunk/samba/debian/samba.postinst	2009-03-01 03:19:04 UTC (rev 2620)
@@ -126,7 +126,8 @@
 		OLDIFS="$IFS"
 		IFS=","
 		for USER in `getent group admin | cut -f4 -d:`; do
-			adduser "$USER" sambashare
+			adduser "$USER" sambashare \
+			|| !getent passwd "$USER" >/dev/null
 		done
 		IFS="$OLDIFS"
 	fi