rhbz#653921 - Can't change NIS password with yppasswd

This commit is contained in:
Karel Klic 2010-11-19 18:40:21 +01:00
parent 7f15ce4c18
commit 53ee8b67a3
2 changed files with 20 additions and 5 deletions

View File

@ -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)
{

View File

@ -1,10 +1,11 @@
Summary: NIS (or YP) client programs Summary: NIS (or YP) client programs
Name: yp-tools Name: yp-tools
Version: 2.11 Version: 2.11
Release: 1%{?dist} Release: 2%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Base Group: System Environment/Base
Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2 Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/yp-tools-%{version}.tar.bz2
Patch0: yp-tools-2.11-shadow.patch
Url: http://www.linux-nis.org/nis/yp-tools/index.html Url: http://www.linux-nis.org/nis/yp-tools/index.html
Requires: ypbind Requires: ypbind
@ -30,6 +31,7 @@ you'll need to install the ypserv package on one machine on the network.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .shadow
%build %build
%configure --disable-domainname %configure --disable-domainname
@ -41,9 +43,6 @@ make DESTDIR="$RPM_BUILD_ROOT" INSTALL_PROGRAM=install install
%find_lang %name %find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog NEWS etc/nsswitch.conf %doc AUTHORS COPYING README ChangeLog NEWS etc/nsswitch.conf
@ -54,13 +53,18 @@ rm -rf $RPM_BUILD_ROOT
/var/yp/nicknames /var/yp/nicknames
%changelog %changelog
* 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 * Tue Apr 20 2010 Karel Klic <kklic@redhat.com> - 2.11-1
- New upstream release - New upstream release
- MD5, SHA-2 passwords patch merged by upstream - MD5, SHA-2 passwords patch merged by upstream
- Removed BuildRoot tag - Removed BuildRoot tag
* Thu Apr 15 2010 Karel Klic <kklic@redhat.com> - 2.10-3 * 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() together, and adds proper MD5/SHA support to verifypassword()
#514061 #514061