rpms/tog-pegasus/devel tog-pegasus.spec,1.19,1.20

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/tog-pegasus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20174

Modified Files:
	tog-pegasus.spec 
Log Message:
wrong wrong wrong. use an assigned uid (66) and gid (65). (gid 66 is wine)
(#175434)



Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- tog-pegasus.spec	11 Feb 2006 05:52:41 -0000	1.19
+++ tog-pegasus.spec	7 Mar 2006 17:40:13 -0000	1.20
@@ -15,7 +15,7 @@
 Summary: 	OpenPegasus WBEM Services for Linux
 Name:    	tog-pegasus
 Version: 	2.5
-Release:	6.1
+Release:	7
 Epoch:   	2
 Group:   	Systems Management/Base
 License: 	Open Group Pegasus Open Source
@@ -204,24 +204,9 @@
 elif [ $1 -eq 1 ]; then
 #  first install: create the 'pegasus' user and group:
 #  By default, ONLY the "pegasus" user will be allowed to connect to cimserver over network
-   if ! /usr/bin/id pegasus >/dev/null 2>&1; then
-      for((uid=466; uid<500; uid++))
-      do
-	if /usr/sbin/groupadd pegasus -g $uid >/dev/null 2>&1 &&
-           /usr/sbin/useradd -u $uid -c  "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1; then
-           break;
-     	else
-	   if egrep -q '^pegasus:.*:'$uid':' /etc/group; then
-              groupdel pegasus >/dev/null 2>&1;
-           fi;
-           if [ $uid -eq 499 ]; then
-              uid=100;
-           elif [ $uid -eq 465 ]; then
-              break;
-           fi;
-        fi;
-      done;
-   fi;
+   /usr/sbin/groupadd pegasus -g 65 >/dev/null 2>&1 || :;
+   /usr/sbin/useradd -u 66 -c "tog-pegasus OpenPegasus WBEM/CIM services" -g pegasus \
+        -s /sbin/nologin -r -d /var/lib/Pegasus pegasus >/dev/null 2>&1 || :;
 fi
 
 %post
@@ -254,6 +239,9 @@
 #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
 
 %changelog
+* Tue Mar  7 2006 Bill Nottingham <notting at redhat.com> - 2:2.5-7
+- use an assigned uid/gid, do not loop over user ids looking for a free one
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2:2.5-6.1
 - bump again for double-long bug on ppc(64)