rpms/ypbind/F-13 ypbind.init,1.24,1.25 ypbind.spec,1.69,1.70

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/ypbind/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4884

Modified Files:
	ypbind.init ypbind.spec 
Log Message:
ypbind.init: take the first domainname in yp.conf and use only that (rhbz#601296)


Index: ypbind.init
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-13/ypbind.init,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ypbind.init	21 Jan 2010 21:22:12 -0000	1.24
+++ ypbind.init	8 Jun 2010 10:21:20 -0000	1.25
@@ -67,7 +67,7 @@ start() {
 	    action $"domain is '$NISDOMAIN' " domainname $NISDOMAIN
 	else # See if the domain is set in config file
 	    NISDOMAIN=`grep "domain" /etc/yp.conf | grep -v ^# | \
-		awk '{print $2}'`
+		awk '{print $2}' | head -1`
 	    if [ -n "$NISDOMAIN" ]; then
 		action $"domain is '$NISDOMAIN' " \
 		    domainname $NISDOMAIN


Index: ypbind.spec
===================================================================
RCS file: /cvs/extras/rpms/ypbind/F-13/ypbind.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- ypbind.spec	19 May 2010 14:50:59 -0000	1.69
+++ ypbind.spec	8 Jun 2010 10:21:20 -0000	1.70
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.31
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -85,6 +85,10 @@ fi
 %doc README NEWS
 
 %changelog
+* Tue Jun  8 2010 Karel Klic <kklic at redhat.com> - 3:1.31-4
+- ypbind.init: take the first domainname in yp.conf and use
+  only that (rhbz#601296)
+
 * Wed May 19 2010 Karel Klic <kklic at redhat.com> - 3:1.31-3
 - Update SELinux context of /etc/yp.conf in nis.sh (rhbz#593278)
 - Use cp+rm instead of mv in nis.sh (#509240)