Fixed segmentation fault in yppoll used without hostname

(rhbz#698619)
Fixed man page typo

yp-tools-2.11-gethost.patch

@@ -0,0 +1,34 @@
+diff -up yp-tools-2.11/.gethost.orig yp-tools-2.11/.gethost
+diff -up yp-tools-2.11/src/yppoll.c.orig yp-tools-2.11/src/yppoll.c
+--- yp-tools-2.11/src/yppoll.c.orig	2011-05-05 09:57:26.528805348 +0200
++++ yp-tools-2.11/src/yppoll.c	2011-05-05 10:00:28.256533438 +0200
+@@ -218,7 +218,10 @@ main (int argc, char **argv)
+ 
+       hent = gethostbyaddr ((char *)&clnt_saddr.sin_addr.s_addr,
+ 			    sizeof (clnt_saddr.sin_addr.s_addr), AF_INET);
+-      hostname = strdup (hent->h_name);
++      if (hent)
++        {
++          hostname = strdup (hent->h_name);
++        }
+     }
+   else
+     {
+@@ -261,7 +264,7 @@ main (int argc, char **argv)
+ 			   &clnt_sock);
+   if (client == NULL)
+     {
+-      fprintf (stderr, _("Can't create connection to %s.\n"), hostname);
++      fprintf (stderr, _("Can't create connection to %s.\n"), hostname ? hostname : "unknown");
+       return 1;
+     }
+ 
+@@ -279,7 +282,7 @@ main (int argc, char **argv)
+   if (clnt_res != TRUE)
+     {
+       fprintf (stdout, _("Domain %s is not supported by %s.\n"), domainname,
+-	       hostname);
++	       hostname ? hostname : "unknown");
+       return 1;
+     }
+ 

yp-tools-2.11-shadow.patch

@@ -0,0 +1,11 @@
+diff -up yp-tools-2.11/src/yppasswd.c.shadow yp-tools-2.11/src/yppasswd.c
+--- yp-tools-2.11/src/yppasswd.c.shadow	2010-04-20 15:31:59.000000000 +0200
++++ yp-tools-2.11/src/yppasswd.c	2010-11-19 18:37:14.931766315 +0100
+@@ -449,6 +449,7 @@ verifypassword (struct passwd *pwd, char
+ 
+   passwdlen = get_passwd_len (pwd->pw_passwd);
+   if (pwd->pw_passwd[0]
++      && 0 != strcmp (pwd->pw_passwd, "x") /* don't check shadow passwords */
+       && !strncmp (pwd->pw_passwd, crypt (pwdstr, pwd->pw_passwd), passwdlen)
+       && uid)
+     {

yp-tools-2.11-typo.patch

@@ -0,0 +1,12 @@
+diff -up yp-tools-2.11/man/ypmatch.1.in.typo yp-tools-2.11/man/ypmatch.1.in
+--- yp-tools-2.11/man/ypmatch.1.in.typo	2011-05-05 09:52:14.754703060 +0200
++++ yp-tools-2.11/man/ypmatch.1.in	2011-05-05 09:52:25.240571968 +0200
+@@ -5,7 +5,7 @@
+ .\"
+ .\" This program is free software; you can redistribute it and/or modify
+ .\" it under the terms of the GNU General Public License version 2 as
+-.\"  published bythe Free Software Foundation.
++.\" published by the Free Software Foundation.
+ .\"
+ .\" This program is distributed in the hope that it will be useful,
+ .\" but WITHOUT ANY WARRANTY; without even the implied warranty of

yp-tools.spec

@@ -1,10 +1,14 @@
 Summary: NIS (or YP) client programs
 Name: yp-tools
 Version: 2.11
-Release: 1%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
+# Not sent to upstream
+Patch0: yp-tools-2.11-shadow.patch
+Patch1: yp-tools-2.11-typo.patch
+Patch2: yp-tools-2.11-gethost.patch
 Url: http://www.linux-nis.org/nis/yp-tools/index.html
 Requires: ypbind
 
@@ -30,6 +34,9 @@ you'll need to install the ypserv package on one machine on the network.
 
 %prep
 %setup -q
+%patch0 -p1 -b .shadow
+%patch1 -p1 -b .typo
+%patch2 -p1 -b .gethost
 
 %build
 %configure --disable-domainname
@@ -41,9 +48,6 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install
 
 %find_lang %name
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README ChangeLog NEWS etc/nsswitch.conf
@@ -54,13 +58,32 @@ rm -rf $RPM_BUILD_ROOT
 /var/yp/nicknames
 
 %changelog
+* Thu May 05 2011 Honza Horak <hhorak@redhat.com> - 2.11-6
+- Fixed segmentation fault in yppoll used without hostname
+  (rhbz#698619)
+
+* Thu May 05 2011 Honza Horak <hhorak@redhat.com> - 2.11-5
+- Fixed man page typo
+
+* Tue Nov 23 2010 Karel Klic <kklic@redhat.com> - 2.11-4
+- Reverted previous change
+
+* Tue Nov 23 2010 Karel Klic <kklic@redhat.com> - 2.11-3
+- Added patch that removes ypclnt.c from being compiled into
+  ypmatch (rhbz#546149)
+
+* Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 2.11-2
+- Added patch to fix yppasswd utility when used with shadow
+  passwords (rhbz#653921)
+- Removed %%clean section
+
 * Tue Apr 20 2010 Karel Klic <kklic@redhat.com> - 2.11-1
 - New upstream release
 - MD5, SHA-2 passwords patch merged by upstream
 - Removed BuildRoot tag
 
 * Thu Apr 15 2010 Karel Klic <kklic@redhat.com> - 2.10-3
-- Added a new patch -passwords, which merges -md5 and -sha-2 patches 
+- Added a new patch -passwords, which merges -md5 and -sha-2 patches
   together, and adds proper MD5/SHA support to verifypassword()
   #514061