diff --git a/ypbind.init b/ypbind.init index a8fcaf1..0e255d5 100755 --- a/ypbind.init +++ b/ypbind.init @@ -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 diff --git a/ypbind.spec b/ypbind.spec index bf61484..be07f33 100644 --- a/ypbind.spec +++ b/ypbind.spec @@ -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 - 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 - 3:1.31-5 - Moved /sbin/ypbind to /usr/sbin/ypbind, as the package depends on several utilities from /usr (selinuxenabled,