rpms/nss/devel setup-nsssysinit.sh,1.3,1.4

[Elio Maldonado]

Author: emaldonado

Update of /cvs/extras/rpms/nss/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16110

Modified Files:
	setup-nsssysinit.sh 
Log Message:
Merge setup-nsssysinit.sh improvements from F-12 (#527051)


Index: setup-nsssysinit.sh
===================================================================
RCS file: /cvs/extras/rpms/nss/devel/setup-nsssysinit.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- setup-nsssysinit.sh	6 Oct 2009 00:09:59 -0000	1.3
+++ setup-nsssysinit.sh	20 Oct 2009 14:13:53 -0000	1.4
@@ -35,8 +35,7 @@ case "$1" in
   on | ON )
     cat ${p11conf} | \
      sed -e 's/^library=$/library=libnsssysinit.so/' \
-         -e '/^NSS/s/Flags=internal,critical/Flags=internal,moduleDBOnly,critical/' \
-         -e '/^NSS/s/Flags=internal,FIPS,critical/Flags=internal,moduleDBOnly,FIPS,critical/' > \
+         -e '/^NSS/s/\(Flags=internal\)\(,[^m]\)/\1,moduleDBOnly\2/' > \
     ${p11conf}.on
     mv ${p11conf}.on ${p11conf}
     ;;
@@ -46,8 +45,7 @@ case "$1" in
     fi
     cat ${p11conf} | \
     sed -e 's/^library=libnsssysinit.so/library=/' \
-        -e '/^NSS/s/Flags=internal,moduleDBOnly,critical/Flags=internal,critical/'   \
-        -e '/^NSS/s/Flags=internal,moduleDBOnly,FIPS,critical/Flags=internal,FIPS,critical/' > \
+        -e '/^NSS/s/Flags=internal,moduleDBOnly/Flags=internal/' > \
         ${p11conf}.off
     mv ${p11conf}.off ${p11conf}
     ;;