rpms/openssh/F-13 openssh.spec,1.198,1.199

[Jan F. Chadima]

Author: jfch2222

Update of /cvs/pkgs/rpms/openssh/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21683

Modified Files:
	openssh.spec 
Log Message:
* Fri May 21 2010 Jan F. Chadima <jchadima at redhat.com> - 5.4p1-2
- synchronize uid and gid for the user sshd



Index: openssh.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openssh/F-13/openssh.spec,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -p -r1.198 -r1.199
--- openssh.spec	9 Mar 2010 09:42:36 -0000	1.198
+++ openssh.spec	21 May 2010 13:50:34 -0000	1.199
@@ -67,7 +67,7 @@
 %endif
 
 # Do not forget to bump pam_ssh_agent_auth release if you rewind the main package release to 1
-%define openssh_rel 1
+%define openssh_rel 2
 %define pam_ssh_agent_rel 24
 %define pam_ssh_agent_ver 0.9.2
 
@@ -427,12 +427,15 @@ popd
 rm -rf $RPM_BUILD_ROOT
 
 %pre server
+getent group sshd >/dev/null || groupadd -g %{sshd_uid} -r sshd || :
 %if %{nologin}
-/usr/sbin/useradd -c "Privilege-separated SSH" -u %{sshd_uid} \
-	-s /sbin/nologin -r -d /var/empty/sshd sshd 2> /dev/null || :
+getent passwd sshd >/dev/null || \
+  useradd -c "Privilege-separated SSH" -u %{sshd_uid} -g sshd  -s /sbin/nologin \
+  -s /sbin/nologin -r -d /var/empty/sshd sshd 2> /dev/null || :
 %else
-/usr/sbin/useradd -c "Privilege-separated SSH" -u %{sshd_uid} \
-	-s /dev/null -r -d /var/empty/sshd sshd 2> /dev/null || :
+getent passwd sshd >/dev/null || \
+  useradd -c "Privilege-separated SSH" -u %{sshd_uid} -g sshd  -s /sbin/nologin \
+  -s /dev/null -r -d /var/empty/sshd sshd 2> /dev/null || :
 %endif
 
 %post server
@@ -524,6 +527,9 @@ fi
 %endif
 
 %changelog
+* Fri May 21 2010 Jan F. Chadima <jchadima at redhat.com> - 5.4p1-2
+- synchronize uid and gid for the user sshd
+
 * Tue Mar  9 2010 Jan F. Chadima <jchadima at redhat.com> - 5.4p1-1
 - Update to 5.4p1
 - discontinued support for nss-keys