From ba9c5ac055b6aa9b89e7e69bb4e316918f84cc47 Mon Sep 17 00:00:00 2001
From: phil <phil@NetBSD.org>
Date: Sun, 15 Jan 1995 03:23:48 +0000
Subject: [PATCH] Fix the bug that stopped a user from changing his yp passwd
 when the entry was ::.  (Also allows root to change the empty password.)

---
 usr.bin/passwd/yp_passwd.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c
index 2d07f1d3d380..26d5b63f7362 100644
--- a/usr.bin/passwd/yp_passwd.c
+++ b/usr.bin/passwd/yp_passwd.c
@@ -32,7 +32,7 @@
  */
 #ifndef lint
 /*static char sccsid[] = "from: @(#)yp_passwd.c	1.0 2/2/93";*/
-static char rcsid[] = "$Id: yp_passwd.c,v 1.6 1994/08/17 06:06:42 deraadt Exp $";
+static char rcsid[] = "$Id: yp_passwd.c,v 1.7 1995/01/15 03:23:48 phil Exp $";
 #endif /* not lint */
 
 #ifdef	YP
@@ -194,12 +194,15 @@ getnewpasswd(pw, old_pass)
 	if (old_pass) {
 		*old_pass = NULL;
 	
-		if (pw->pw_passwd &&
+		if (pw->pw_passwd[0] &&
 		    strcmp(crypt(p = getpass("Old password:"), pw->pw_passwd),
 			   pw->pw_passwd)) {
 				   errno = EACCES;
 				   pw_error(NULL, 1, 1);
+		} else {
+			p = "";
 		}
+
 		*old_pass = strdup(p);
 	}
 	for (buf[0] = '\0', tries = 0;;) {