[med-svn] r2522 - trunk/packages/arb/trunk/debian

[tille at alioth.debian.org]

Author: tille
Date: 2008-09-23 13:22:56 +0000 (Tue, 23 Sep 2008)
New Revision: 2522

Modified:
   trunk/packages/arb/trunk/debian/arb-common.config
   trunk/packages/arb/trunk/debian/changelog
Log:
Make sure config script works when using NIS


Modified: trunk/packages/arb/trunk/debian/arb-common.config
===================================================================
--- trunk/packages/arb/trunk/debian/arb-common.config	2008-09-23 13:07:54 UTC (rev 2521)
+++ trunk/packages/arb/trunk/debian/arb-common.config	2008-09-23 13:22:56 UTC (rev 2522)
@@ -29,14 +29,16 @@
 fi
 
 (IFS=":"
-    while read user pass uid gid name rest ; do
-	if [ $uid -ge $FIRST_UID ] ; then
-	    if [ ! "$user" = "nobody" ] ; then
-		name=`echo $name | sed "s/,.*//"`
-		echo "$user ($name)" >> ${TMPFILE}
-	    fi
-	fi
-    done < /etc/passwd
+	while read user pass uid gid name rest ; do
+        	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" != "" ] ; then
+                        	name=`echo $name | sed "s/,.*//"`
+				echo "$user ($name)" >> ${TMPFILE}
+                        fi
+		fi
+	done < /etc/passwd
 )
 
 # Login names of all users of the system as comma separated list

Modified: trunk/packages/arb/trunk/debian/changelog
===================================================================
--- trunk/packages/arb/trunk/debian/changelog	2008-09-23 13:07:54 UTC (rev 2521)
+++ trunk/packages/arb/trunk/debian/changelog	2008-09-23 13:22:56 UTC (rev 2522)
@@ -5,6 +5,8 @@
   * Fix arb name server location in config file (Thanks to
     Felipe Figueiredo <philsf79 at gmail.com>)
     Closes: #495650
+  * arb-common.config: Make sure that config file will not fail
+    when NIS is used
 
  -- Andreas Tille <tille at debian.org>  Tue, 23 Sep 2008 13:32:05 +0200