For the NIS+ Utilities, please get nis-utils-1.0.tar.gz and
apply both patches: nis-utils-1.0a.diff and this patch,
nis-utils-1.0b.diff.

  Thorsten Kukuk <kukuk@suse.de>

Index: nis-utils/src/nispasswd//npd_upd_pwd.c
===================================================================
RCS file: /homes/defiant/software/cvsroot/nis-utils/src/nispasswd/npd_upd_pwd.c,v
retrieving revision 1.10
diff -u -r1.10 npd_upd_pwd.c
--- nis-utils/src/nispasswd//npd_upd_pwd.c	1999/04/26 19:56:09	1.10
+++ nis-utils/src/nispasswd//npd_upd_pwd.c	1999/06/06 18:57:28
@@ -32,7 +32,7 @@
 #include <rpcsvc/nis.h>
 #include "nispasswd.h"
 
-extern int key_get_conv (char *pkey, des_block * deskey);
+extern int key_get_conv (char *pkey, des_block *deskey);
 
 #ifndef _
 #define _(String) gettext (String)
@@ -403,30 +403,24 @@
 	     __NPD_MAXPASSBYTES);
 
   cp = strndup (NISENTRYVAL(4,obj), NISENTRYLEN(4,obj));
+  update.pass_info.pw_gecos = "";
   if (change_gecos)
     {
       char *gecos = prompt (_("Full name"), cp);
 
       if (gecos != NULL)
 	update.pass_info.pw_gecos = gecos;
-      else
-	update.pass_info.pw_gecos = cp;
     }
-  else
-    update.pass_info.pw_gecos = cp;
 
   cp = strndup (NISENTRYVAL(6,obj), NISENTRYLEN(6,obj));
+  update.pass_info.pw_shell = "";
   if (change_shell)
     {
       char *shell = prompt (_("New shell"), cp);
 
       if (shell != NULL)
 	update.pass_info.pw_shell = shell;
-      else
-	update.pass_info.pw_shell = cp;
     }
-  else
-    update.pass_info.pw_shell = cp;
 
   memset (ivec, 0, 8);
   error = cbc_crypt ((char *) &CK, (char *) &update.xnewpass,