Index: nis-utils/lib/key_common/pkey.c
===================================================================
RCS file: /homes/defiant/software/cvsroot/nis-utils/lib/key_common/pkey.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 pkey.c
--- nis-utils-1.0/lib/key_common/pkey.c	1998/10/11 16:19:44	1.1.1.1
+++ nis-utils-1.0/lib/key_common/pkey.c	1999/04/26 19:44:33
@@ -192,7 +192,7 @@
 
   result = _getnswbyname ((char *) "publickey");
 
-  if (result->orderc == 0)
+  if (result == NULL || result->orderc == 0)
     {
       fprintf (stderr, _("ERROR: There is no publickey entry in %s.\n"),
 	       PATH_NSWCONF);
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.9
diff -u -r1.9 npd_upd_pwd.c
--- nis-utils-1.0/src/nispasswd/npd_upd_pwd.c	1999/03/15 20:56:44	1.9
+++ nis-utils-1.0/src/nispasswd/npd_upd_pwd.c	1999/04/26 19:36:52
@@ -287,7 +287,7 @@
   memset (&request, '\0', sizeof (request));
   request.ident = 0;
   request.key_type = strdup ("DES");
-  request.domain = strdup (obj->zo_domain);
+  request.domain = strdup (nis_domain_of (obj->zo_domain));
   request.username = strndup (NISENTRYVAL(0,obj), NISENTRYLEN(0,obj));
 
   /* get publickey of the user */