From d878eb2c3321cb46b81fd46e0b58eeb9ace1e82b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 11:08:23 +0000
Subject: import ypserv-2.31-12.el7


---

diff --git a/SOURCES/ypserv-2.19-ypchsh-adjunct.patch b/SOURCES/ypserv-2.19-ypchsh-adjunct.patch
new file mode 100644
index 0000000..8edcb61
--- /dev/null
+++ b/SOURCES/ypserv-2.19-ypchsh-adjunct.patch
@@ -0,0 +1,13 @@
+--- ypserv-2.19/rpc.yppasswdd/update.c	2018-08-22 12:28:08.745629282 +0200
++++ ypserv-2.19/rpc.yppasswdd/update.c	2018-08-22 12:28:36.424079754 +0200
+@@ -604,7 +604,9 @@
+ 	      !((yppw->newpw.pw_passwd[0] == 'x' ||
+ 		 yppw->newpw.pw_passwd[0] == '*') &&
+ 		yppw->newpw.pw_passwd[1] == '\0') &&
+-	      yppw->newpw.pw_passwd[0] != '\0')
++	      yppw->newpw.pw_passwd[0] != '\0' &&
++          !(yppw->newpw.pw_passwd[0] == '#' &&
++            yppw->newpw.pw_passwd[1] == '#'))
+ 	    {
+ #ifdef HAVE_GETSPNAM /* shadow password */
+ 	      if (spw)
diff --git a/SPECS/ypserv.spec b/SPECS/ypserv.spec
index faad715..ff36731 100644
--- a/SPECS/ypserv.spec
+++ b/SPECS/ypserv.spec
@@ -2,7 +2,7 @@ Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.31
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: http://www.linux-nis.org/download/ypserv/ypserv-%{version}.tar.bz2
@@ -34,6 +34,7 @@ Patch12: ypserv-minuid.patch
 Patch13: ypserv-2.31-map-update.patch
 Patch14: ypserv-2.31-open-correct-db.patch
 Patch15: ypserv-2.31-selinux-context.patch
+Patch16: ypserv-2.19-ypchsh-adjunct.patch
 
 BuildRequires: tokyocabinet-devel
 BuildRequires: systemd
@@ -75,6 +76,7 @@ machines.
 %patch13 -p1 -b .map-update
 %patch14 -p1 -b .open-correct-db
 %patch15 -p1 -b .selinux-context
+%patch16 -p1 -b .ypchsh-adjunct
 
 autoreconf
 
@@ -165,6 +167,10 @@ install -m 755 %{SOURCE4} $RPM_BUILD_ROOT%{_libexecdir}/rpc.yppasswdd.env
 %{_includedir}/*/*
 
 %changelog
+* Thu Jan 31 2019 Petr Kubat <pkubat@redhat.com> - 2.31-12
+- Do not overwrite user password in passwd.adjunct when changing shell
+- Resolves: #1624295
+
 * Fri Apr 20 2018 Petr Kubat <pkubat@redhat.com> - 2.31-11
 - rpc.yppasswd: Only check selinux context if selinux is enabled
   Resolves: #1492892