OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Dec-2004 18:49:33
Branch: HEAD Handle: 2004122217493300
Modified files:
openpkg-src/openpkg rpmmacros
Log:
consistenly (both reading and writing) account for darwin netinfo
password and group storage
Summary:
Revision Changes Path
1.66 +8 -8 openpkg-src/openpkg/rpmmacros
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpmmacros
============================================================================
$ cvs diff -u -r1.65 -r1.66 rpmmacros
--- openpkg-src/openpkg/rpmmacros 9 Jun 2004 11:48:22 -0000 1.65
+++ openpkg-src/openpkg/rpmmacros 22 Dec 2004 17:49:33 -0000 1.66
@@ -102,26 +102,26 @@
# the *S*uper-user user/group name/id pair
%l_susr @SUSR@
%l_sgrp @SGRP@
-%l_suid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_susr}:" | sed -e 'q' | awk -F: '{ print $3; }')
-%l_sgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_sgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_suid %((getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null | grep "^%{l_susr}:" | sed -e 'q' | awk -F: '{
print $3; }')
+%l_sgid %((getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null | grep "^%{l_sgrp}:" | sed -e 'q' | awk -F: '{
print $3; }')
# the *M*anagement user/group name/id pair
%l_musr @MUSR@
%l_mgrp @MGRP@
-%l_muid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_musr}:" | sed -e 'q' | awk -F: '{ print $3; }')
-%l_mgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_mgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_muid %((getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null | grep "^%{l_musr}:" | sed -e 'q' | awk -F: '{
print $3; }')
+%l_mgid %((getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null | grep "^%{l_mgrp}:" | sed -e 'q' | awk -F: '{
print $3; }')
# the *R*restricted user/group name/id pair
%l_rusr @RUSR@
%l_rgrp @RGRP@
-%l_ruid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_rusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
-%l_rgid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_rgrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_ruid %((getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null | grep "^%{l_rusr}:" | sed -e 'q' | awk -F: '{
print $3; }')
+%l_rgid %((getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null | grep "^%{l_rgrp}:" | sed -e 'q' | awk -F: '{
print $3; }')
# the *N*on-privileged user/group name/id pair
%l_nusr @NUSR@
%l_ngrp @NGRP@
-%l_nuid %((getent passwd; cat /etc/passwd; ypcat passwd)
2>/dev/null | grep "^%{l_nusr}:" | sed -e 'q' | awk -F: '{ print $3; }')
-%l_ngid %((getent group; cat /etc/group; ypcat group)
2>/dev/null | grep "^%{l_ngrp}:" | sed -e 'q' | awk -F: '{ print $3; }')
+%l_nuid %((getent passwd; cat /etc/passwd; ypcat passwd;
nidump passwd .) 2>/dev/null | grep "^%{l_nusr}:" | sed -e 'q' | awk -F: '{
print $3; }')
+%l_ngid %((getent group; cat /etc/group; ypcat group;
nidump group .) 2>/dev/null | grep "^%{l_ngrp}:" | sed -e 'q' | awk -F: '{
print $3; }')
# backward compatibility (openpkg < 20020204)
%l_fsusr %{l_musr}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
