Backport -shadow fix from master branch.

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.spec

@@ -1,13 +1,14 @@
 Summary: NIS (or YP) client programs
 Name: yp-tools
 Version: 2.10
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2
 Group: System Environment/Base
 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
 Url: http://www.linux-nis.org/nis/yp-tools/index.html
 # Sent to the upstream.
-Patch1: yp-tools-2.10-passwords.patch
+Patch0: yp-tools-2.10-passwords.patch
+Patch1: yp-tools-2.11-shadow.patch
 Requires: ypbind
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -33,7 +34,8 @@ you'll need to install the ypserv package on one machine on the network.
 
 %prep
 %setup -q
-%patch1 -p1 -b .passwords
+%patch0 -p1 -b .passwords
+%patch1 -p1 -b .shadow
 
 %build
 %configure --disable-domainname
@@ -59,8 +61,12 @@ rm -rf $RPM_BUILD_ROOT
 %dir /var/yp
 
 %changelog
+* Fri Nov 19 2010 Karel Klic <kklic@redhat.com> - 2.10-3
+- Added patch to fix yppasswd utility when used with shadow
+  passwords (rhbz#653921)
+
 * Thu Apr 15 2010 Karel Klic <kklic@redhat.com> - 2.10-2
-- 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