--- usr.bin/passwd/yp_passwd.c.orig	Sat May 29 00:12:46 2004
+++ usr.bin/passwd/yp_passwd.c	Sat May 29 00:08:21 2004
@@ -50,7 +50,7 @@
 #include <err.h>
 #include "yppasswd_private.h"
 
-extern char *getnewpasswd(struct passwd *, int);
+extern char *getnewpasswd(struct passwd *, int, const char *);
 
 int
 yp_passwd(char *user)
@@ -138,10 +138,10 @@
 	}
 
 	if (suser_override) {
-		if ((master_yppasswd.newpw.pw_passwd = getnewpasswd(pw, 1)) == NULL)
+		if ((master_yppasswd.newpw.pw_passwd = getnewpasswd(pw, 1, yppasswd.oldpass)) == NULL)
 			return(1);
 	} else {
-		if ((yppasswd.newpw.pw_passwd = getnewpasswd(pw, 1)) == NULL)
+		if ((yppasswd.newpw.pw_passwd = getnewpasswd(pw, 1, yppasswd.oldpass)) == NULL)
 			return(1);
 	}