rpms/ypbind/devel ypbind.init,1.25,1.26 ypbind.spec,1.71,1.72

[Karel Klíč]

Author: kklic

Update of /cvs/extras/rpms/ypbind/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4177

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/devel/ypbind.init,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ypbind.init	21 May 2010 12:27:21 -0000	1.25
+++ ypbind.init	8 Jun 2010 10:15:46 -0000	1.26
@@ -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/devel/ypbind.spec,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ypbind.spec	21 May 2010 12:27:21 -0000	1.71
+++ ypbind.spec	8 Jun 2010 10:15:47 -0000	1.72
@@ -1,7 +1,7 @@
 Summary: The NIS daemon which binds NIS clients to an NIS domain
 Name: ypbind
 Version: 1.31
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@@ -79,6 +79,10 @@ fi
 %doc README NEWS COPYING
 
 %changelog
+* Tue Jun  8 2010 Karel Klic <kklic at redhat.com> - 3:1.31-6
+- ypbind.init: take the first domainname in yp.conf and use
+  only that (rhbz#601296)
+
 * Fri May 21 2010 Karel Klic <kklic at redhat.com> - 3:1.31-5
 - Moved /sbin/ypbind to /usr/sbin/ypbind, as the package
   depends on several utilities from /usr (selinuxenabled,