rpms/ypbind/devel nis.sh,1.3,1.4 ypbind.spec,1.60,1.61

[Vitezslav Crhonek]

Author: vcrhonek

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

Modified Files:
	nis.sh ypbind.spec 
Log Message:
Fix nis.sh SELinux issue


Index: nis.sh
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/nis.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nis.sh	26 Feb 2009 14:57:09 -0000	1.3
+++ nis.sh	18 Mar 2009 12:19:32 -0000	1.4
@@ -23,6 +23,12 @@
 
 CONF=/etc/yp.conf
 
+fixContext() {
+    if [ -x /sbin/restorecon ]; then
+        /sbin/restorecon ${1} >/dev/null 2>&1
+    fi
+}
+
 save_config_file() {
     origfile="${1}"
     savefile="${SAVEDIR}/${origfile##*/}.predhclient.${interface}"
@@ -37,7 +43,7 @@
         echo > ${savefile}
     fi
 
-    restorecon ${savefile} >/dev/null 2>&1
+    fixContext ${savefile}
 }
 
 nis_config() {
@@ -89,6 +95,7 @@
         if [ -f ${SAVEDIR}/${CONF}.predhclient.${interface} ]; then
             rm -f ${CONF}
             mv -f ${SAVEDIR}/${CONF}.predhclient.${interface} ${CONF}
+            fixContext /etc/yp.conf
             if [ -x /etc/rc.d/init.d/ypbind ] && [ -r /var/run/ypbind.pid ]; then
                 service ypbind restart >/dev/null 2>&1
             fi


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/devel/ypbind.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- ypbind.spec	26 Feb 2009 14:57:09 -0000	1.60
+++ ypbind.spec	18 Mar 2009 12:19:32 -0000	1.61
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.20.4
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -97,6 +97,10 @@
 %doc README NEWS
 
 %changelog
+* Wed Mar 18 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-17
+- Fix nis.sh SELinux issue
+  Resolves: #488865
+
 * Thu Feb 26 2009 Vitezslav Crhonek <vcrhonek at redhat.com> - 3:1.20.4-16
 - Fix ypbind script in dos format - bash syntax errors
   Resolves: #486722