rpms/tog-pegasus/devel tog-pegasus.spec,1.15,1.16

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	tog-pegasus.spec 
Log Message:
fix bug 175434


Index: tog-pegasus.spec
===================================================================
RCS file: /cvs/dist/rpms/tog-pegasus/devel/tog-pegasus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- tog-pegasus.spec	9 Dec 2005 22:43:37 -0000	1.15
+++ tog-pegasus.spec	15 Dec 2005 22:49:19 -0000	1.16
@@ -15,7 +15,7 @@
 Summary: 	OpenPegasus WBEM Services for Linux
 Name:    	tog-pegasus
 Version: 	2.5
-Release: 4.1
+Release:	5
 Epoch:   	2
 Group:   	Systems Management/Base
 License: 	Open Group Pegasus Open Source
@@ -195,9 +195,24 @@
 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
-   /usr/sbin/groupadd pegasus -g 66 >/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 || :;
+   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;
 fi
 
 %post
@@ -230,17 +245,21 @@
 #rm -rf ${RPM_BUILD_DIR}/%{srcname}-%{version};
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
+* Thu Dec 15 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-5
+- fix bug 175434 : deal with pegasus uid/gid already existing
+  on first install
+
+* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com> - 2:2.5-4.1
 - rebuilt
 
-* Wed Nov 16 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-4
+* Wed Nov 16 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-4
 - fix bug 173401: SSL support broken by openssl-0.9.7g -> 0.9.8a upgrade 
 
-* Wed Nov 09 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-3
+* Wed Nov 09 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-3
 - Rebuild for new openssl dependencies
 - Enable CMPI support for sblim-cmpi-base with ENABLE_CQL=true
 
-* Mon Oct 31 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-2
+* Mon Oct 31 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-2
 - Add /usr/lib/cmpi alternate providerLibDir for sblim-cmpi-base Fedora Extras pkg
 - Fix bug 171124: use numeric ids for pegasus user/group
 - guidelines: do not remove pegasus user/group in %%postun.
@@ -248,10 +267,10 @@
 * Fri Oct 14 2005 Tomas Mraz <tmraz at redhat.com>
 - use include instead of pam_stack in pam config
 
-* Fri Sep 30 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-1
+* Fri Sep 30 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-1
 - Implemented new 'make install' target.
 - Re-wrote tog-pegasus.spec file from scratch.
 - Ported BZ 167986 authentication code and BZ 167164 + BZ 167165 fixes from RHEL-4
 
-* Wed Sep 28 2005 Jason Vas Dias <jvdias at redhat.com> - 2:tog-pegasus-2.5-0
+* Wed Sep 28 2005 Jason Vas Dias <jvdias at redhat.com> - 2:2.5-0
 - Initial build.