[Cdd-commits] r991 - in cdd/trunk/cdd: debian share/cdd/unixgroups

[CDD Subversion Commit]

Author: tille
Date: Mon Jul 21 13:24:44 2008
New Revision: 991

Modified:
   cdd/trunk/cdd/debian/changelog
   cdd/trunk/cdd/share/cdd/unixgroups/cdd-actions
Log:
Do not fail for NIS users (Closes: #491680)


Modified: cdd/trunk/cdd/debian/changelog
==============================================================================
--- cdd/trunk/cdd/debian/changelog	(original)
+++ cdd/trunk/cdd/debian/changelog	Mon Jul 21 13:24:44 2008
@@ -1,8 +1,11 @@
-cdd (0.5.6) UNRELEASED; urgency=low
+cdd (0.5.6) unstable; urgency=low
 
   * doc/Makefile: publish target now enables moving the docs to
     http://cdd.alioth.debian.org/cdd instead of
     people.debian.org/~tille/cdd
+  * share/cdd/unixgroups/cdd-actions: Do not fail if there are
+    NIS users on this machine.  These will just be ignored.
+    Closes: #491680
 
  -- Andreas Tille <tille at debian.org>  Sun, 13 Jul 2008 13:45:32 +0200
 

Modified: cdd/trunk/cdd/share/cdd/unixgroups/cdd-actions
==============================================================================
--- cdd/trunk/cdd/share/cdd/unixgroups/cdd-actions	(original)
+++ cdd/trunk/cdd/share/cdd/unixgroups/cdd-actions	Mon Jul 21 13:24:44 2008
@@ -129,12 +129,16 @@
 		TMPFILE=`tempfile`
 		(IFS=":"
 			while read user pass uid gid name rest ; do
-				if [ $uid -ge $FIRST_UID -a "$user" != "nobody" ] ; then
-        				name=`echo $name | sed "s/,.*//"`
-				        if [ $SIMPLE -eq 1 ] ; then
-				                echo "$user" >> ${TMPFILE}
-				        else
-				                echo "$user ($name)" >> ${TMPFILE}
+				if [ "$uid" != "" ] ; then
+					# in case NIS is used on the machine $uid remains
+					# empty and breaks the following condition.
+					if [ $uid -ge $FIRST_UID -a "$user" != "nobody" ] ; then
+        					name=`echo $name | sed "s/,.*//"`
+					        if [ $SIMPLE -eq 1 ] ; then
+					                echo "$user" >> ${TMPFILE}
+					        else
+				        	        echo "$user ($name)" >> ${TMPFILE}
+						fi
 					fi
 				fi
 			done < /etc/passwd