Update.

1998-10-30  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de> 
 
	* sunrpc/Versions: Add xdr_uint32_t and xdr_int32_t. 
	* sunrpc/pmap_rmt.c: Initialize clnt_stat variable. 
	* sunrpc/rpc/auth_des.h: Use uint32_t for time values. 
	* sunrpc/rpc/xdr.h: Add INT32 support. 
	* sunrpc/xdr.c: Implement xdr_int32_t and xdr_uint32_t .
 
	* nis/nis_call.c: Changes for new 64bit clean NIS+ interface. 
	* nis/nis_callback.c: Likewise. 
	* nis/nis_creategroup.c: Likewise. 
	* nis/nis_defaults.c: Likewise. 
	* nis/nis_intern.h: Likewise. 
	* nis/nis_lookup.c: Likewise. 
	* nis/nis_ping.c: Likewise. 
	* nis/nis_print.c: Likewise. 
	* nis/nis_table.c: Likewise. 
	* nis/nis_util.c: Likewise. 
	* nis/nis_xdr.c: Likewise. 
	* nis/rpcsvc/nis.h: Likewise. 
	* nis/rpcsvc/nis.x: Likewise. 
	* nis/rpcsvc/nis_callback.h: Likewise. 
	* nis/rpcsvc/nis_object.x: Likewise. 
	* nis/rpcsvc/nislib.h: Likewise. 
 
	* nis/rpcsvc/yp.h: Remove casts to (u_long). 
	* nis/rpcsvc/yp_prot.h: Likewise. 
	* nis/rpcsvc/ypupd.h: Likewise. 
	* nis/ypclnt.c: Change %ld to %d in sprintf. 
 

26 files changed, 373 insertions, 365 deletions

diff --git a/ChangeLog b/ChangeLog
index e6a5ccc3d2..8aeb966b75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+1998-10-30  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de> 
+ 
+	* sunrpc/Versions: Add xdr_uint32_t and xdr_int32_t. 
+	* sunrpc/pmap_rmt.c: Initialize clnt_stat variable. 
+	* sunrpc/rpc/auth_des.h: Use uint32_t for time values. 
+	* sunrpc/rpc/xdr.h: Add INT32 support. 
+	* sunrpc/xdr.c: Implement xdr_int32_t and xdr_uint32_t .
+ 
+	* nis/nis_call.c: Changes for new 64bit clean NIS+ interface. 
+	* nis/nis_callback.c: Likewise. 
+	* nis/nis_creategroup.c: Likewise. 
+	* nis/nis_defaults.c: Likewise. 
+	* nis/nis_intern.h: Likewise. 
+	* nis/nis_lookup.c: Likewise. 
+	* nis/nis_ping.c: Likewise. 
+	* nis/nis_print.c: Likewise. 
+	* nis/nis_table.c: Likewise. 
+	* nis/nis_util.c: Likewise. 
+	* nis/nis_xdr.c: Likewise. 
+	* nis/rpcsvc/nis.h: Likewise. 
+	* nis/rpcsvc/nis.x: Likewise. 
+	* nis/rpcsvc/nis_callback.h: Likewise. 
+	* nis/rpcsvc/nis_object.x: Likewise. 
+	* nis/rpcsvc/nislib.h: Likewise. 
+ 
+	* nis/rpcsvc/yp.h: Remove casts to (u_long). 
+	* nis/rpcsvc/yp_prot.h: Likewise. 
+	* nis/rpcsvc/ypupd.h: Likewise. 
+	* nis/ypclnt.c: Change %ld to %d in sprintf. 
+ 
 1998-10-29  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de> 
  
 	* manual/locale.texi (Formatting Numbers): Fix strfmon examples. 
diff --git a/nis/nis_call.c b/nis/nis_call.c
index ce7607f4e1..73bd2d7de2 100644
--- a/nis/nis_call.c
+++ b/nis/nis_call.c
@@ -180,8 +180,8 @@ __nisbind_connect (dir_binding *dbp)
 }
 
 nis_error
-__nisbind_create (dir_binding *dbp, const nis_server *serv_val, u_int serv_len,
-		  u_long flags)
+__nisbind_create (dir_binding *dbp, const nis_server *serv_val,
+		  unsigned int serv_len, unsigned int flags)
 {
   dbp->clnt = NULL;
 
@@ -220,7 +220,7 @@ __nisbind_create (dir_binding *dbp, const nis_server *serv_val, u_int serv_len,
    So we could use the same binding twice */
 nis_error
 __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req,
-	       xdrproc_t xres, caddr_t resp, u_long flags, nis_cb *cb)
+	       xdrproc_t xres, caddr_t resp, unsigned int flags, nis_cb *cb)
 {
   enum clnt_stat result;
   nis_error retcode;
@@ -325,7 +325,7 @@ __do_niscall3 (dir_binding *dbp, u_long prog, xdrproc_t xargs, caddr_t req,
 nis_error
 __do_niscall2 (const nis_server *server, u_int server_len, u_long prog,
 	       xdrproc_t xargs, caddr_t req, xdrproc_t xres, caddr_t resp,
-	       u_long flags, nis_cb *cb)
+	       unsigned int flags, nis_cb *cb)
 {
   dir_binding dbp;
   nis_error status;
@@ -550,7 +550,7 @@ __nisfind_server (const_nis_name name, directory_obj **dir)
 
 nis_error
 __do_niscall (const_nis_name name, u_long prog, xdrproc_t xargs,
-	      caddr_t req, xdrproc_t xres, caddr_t resp, u_long flags,
+	      caddr_t req, xdrproc_t xres, caddr_t resp, unsigned int flags,
 	      nis_cb *cb)
 {
   nis_error retcode;
diff --git a/nis/nis_callback.c b/nis/nis_callback.c
index 5c8828d1fc..6525484b45 100644
--- a/nis/nis_callback.c
+++ b/nis/nis_callback.c
@@ -55,7 +55,7 @@ __nis_getpkey(const char *sname)
   char pkey[HEXKEYBYTES + 1];
   char *cp, *domain;
   nis_result *res;
-  u_int len = 0;
+  unsigned int len = 0;
 
   domain = strchr (sname, '.');
   if (domain == NULL)
@@ -115,7 +115,7 @@ cb_prog_1 (struct svc_req *rqstp, SVCXPRT *transp)
 
     case CBPROC_RECEIVE:
       {
-	u_long i;
+	unsigned int i;
 
 	xdr_argument = (xdrproc_t) xdr_cback_data;
 	xdr_result = (xdrproc_t) xdr_bool;
@@ -261,7 +261,7 @@ __nis_do_callback (struct dir_binding *bptr, netobj *cookie,
 struct nis_cb *
 __nis_create_callback (int (*callback) (const_nis_name, const nis_object *,
 					const void *),
-		       const void *userdata, u_long flags)
+		       const void *userdata, unsigned int flags)
 {
   struct nis_cb *cb;
   int sock = RPC_ANYSOCK;
diff --git a/nis/nis_creategroup.c b/nis/nis_creategroup.c
index cd882ca01d..eeac957646 100644
--- a/nis/nis_creategroup.c
+++ b/nis/nis_creategroup.c
@@ -21,7 +21,7 @@
 #include <rpcsvc/nis.h>
 
 nis_error
-nis_creategroup (const_nis_name group, u_long flags)
+nis_creategroup (const_nis_name group, unsigned int flags)
 {
   if (group != NULL && group[0] != '\0')
     {
diff --git a/nis/nis_defaults.c b/nis/nis_defaults.c
index 729bc4c86a..8ddf67e778 100644
--- a/nis/nis_defaults.c
+++ b/nis/nis_defaults.c
@@ -69,12 +69,12 @@ searchowner (char *str)
   return strndup (cptr, i);
 }
 
-static u_long
+static uint32_t
 searchttl (char *str)
 {
   char buf[strlen (str) + 1];
   char *cptr, *dptr;
-  u_long time;
+  uint32_t time;
   int i;
 
   dptr = strstr (str, "ttl=");
@@ -129,12 +129,12 @@ searchttl (char *str)
   return time;
 }
 
-static u_long
-searchaccess (char *str, u_long access)
+static unsigned int
+searchaccess (char *str, unsigned int access)
 {
   char buf[strlen (str) + 1];
   char *cptr;
-  u_long result = access;
+  unsigned int result = access;
   int i;
   int n, o, g, w;
 
@@ -222,7 +222,7 @@ searchaccess (char *str, u_long access)
 		    result = result & ~(NIS_DESTROY_ACC);
 		  break;
 		default:
-		  return ULONG_MAX;
+		  return (~0U);
 		}
 	      cptr++;
 	    }
@@ -275,7 +275,7 @@ searchaccess (char *str, u_long access)
 		    result = result | (NIS_DESTROY_ACC);
 		  break;
 		default:
-		  return ULONG_MAX;
+		  return (~0U);
 		}
 	      cptr++;
 	    }
@@ -342,14 +342,14 @@ searchaccess (char *str, u_long access)
 		    result = result | (NIS_DESTROY_ACC);
 		  break;
 		default:
-		  return result = ULONG_MAX;
+		  return result = (~0U);
 		}
 	      cptr++;
 	    }
 	  n = o = g = w = 0;
 	  break;
 	default:
-	  return result = ULONG_MAX;
+	  return result = (~0U);
 	}
       if (*cptr != '\0')
 	cptr++;
@@ -436,7 +436,7 @@ __nis_default_group (char *defaults)
   return strdup (default_group);
 }
 
-u_long
+uint32_t
 __nis_default_ttl (char *defaults)
 {
   char *cptr, *dptr;
@@ -461,10 +461,10 @@ __nis_default_ttl (char *defaults)
 
 /* Default access rights are ----rmcdr---r---, but we could change
    this with the NIS_DEFAULTS variable. */
-u_long
-__nis_default_access (char *param, u_long defaults)
+unsigned int
+__nis_default_access (char *param, unsigned int defaults)
 {
-  u_long result;
+  unsigned int result;
   char *cptr;
 
   if (defaults == 0)
diff --git a/nis/nis_intern.h b/nis/nis_intern.h
index 9f515bb460..4ca47473ce 100644
--- a/nis/nis_intern.h
+++ b/nis/nis_intern.h
@@ -41,18 +41,18 @@ extern long __nis_findfastest __P ((dir_binding *bind));
 extern nis_error __do_niscall2 __P ((const nis_server *serv, u_int serv_len,
 				     u_long prog, xdrproc_t xargs, caddr_t req,
 				     xdrproc_t xres, caddr_t resp,
-				     u_long flags, nis_cb *cb));
+				     unsigned int flags, nis_cb *cb));
 extern nis_error __do_niscall __P ((const_nis_name name, u_long prog,
 				    xdrproc_t xargs, caddr_t req,
 				    xdrproc_t xres, caddr_t resp,
-				    u_long flags, nis_cb *cb));
+				    unsigned int flags, nis_cb *cb));
 
 /* NIS+ callback */
 extern nis_error __nis_do_callback __P ((struct dir_binding *bptr,
 					 netobj *cookie, struct nis_cb *cb));
 extern struct nis_cb *__nis_create_callback
       __P ((int (*callback)(const_nis_name, const nis_object *, const void *),
-	    const void *userdata, u_long flags));
+	    const void *userdata, unsigned int flags));
 extern nis_error __nis_destroy_callback __P ((struct nis_cb *cb));
 
 __END_DECLS
diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c
index df16cceeac..e194b977e4 100644
--- a/nis/nis_lookup.c
+++ b/nis/nis_lookup.c
@@ -23,7 +23,7 @@
 #include "nis_intern.h"
 
 nis_result *
-nis_lookup (const_nis_name name, const u_long flags)
+nis_lookup (const_nis_name name, const unsigned int flags)
 {
   nis_result *res = calloc (1, sizeof (nis_result));
   struct ns_request req;
diff --git a/nis/nis_ping.c b/nis/nis_ping.c
index 3fc87551f5..bc6db38e93 100644
--- a/nis/nis_ping.c
+++ b/nis/nis_ping.c
@@ -23,12 +23,13 @@
 #include "nis_intern.h"
 
 void
-nis_ping (const_nis_name dirname, u_long utime, const nis_object *dirobj)
+nis_ping (const_nis_name dirname, unsigned int utime,
+	  const nis_object *dirobj)
 {
   nis_result *res = NULL;
   nis_object *obj;
   ping_args args;
-  u_int i;
+  unsigned int i;
 
   if (dirname == NULL && dirobj == NULL)
     abort ();
diff --git a/nis/nis_print.c b/nis/nis_print.c
index b578cbfb65..2433d4fd88 100644
--- a/nis/nis_print.c
+++ b/nis/nis_print.c
@@ -49,9 +49,9 @@ nis_nstype2str (const nstype type)
 }
 
 static void
-print_ttl (const u_long ttl)
+print_ttl (const uint32_t ttl)
 {
-  unsigned long int time, s, m, h;
+  uint32_t time, s, m, h;
 
   time = ttl;
 
@@ -60,11 +60,11 @@ print_ttl (const u_long ttl)
   m = time / 60;
   time %= 60;
   s = time;
-  printf ("%lu:%lu:%lu\n", h, m, s);
+  printf ("%u:%u:%u\n", h, m, s);
 }
 
 static void
-print_flags (const u_long flags)
+print_flags (const unsigned int flags)
 {
   fputs ("(", stdout);
 
@@ -132,10 +132,10 @@ nis_print_objtype (enum zotypes type)
 }
 
 void
-nis_print_rights (const u_long access)
+nis_print_rights (const unsigned int access)
 {
   char result[17];
-  u_long acc;
+  unsigned int acc;
   int i;
 
   acc = access;			/* Parameter is const ! */
@@ -247,7 +247,7 @@ nis_print_group (const group_obj *obj)
 
   fputs (_("Group Flags :"), stdout);
   if (obj->gr_flags)
-    printf ("0x%08lX", obj->gr_flags);
+    printf ("0x%08X", obj->gr_flags);
   fputs (_("\nGroup Members :\n"), stdout);
 
   for (i = 0; i < obj->gr_members.gr_members_len; i++)
@@ -316,8 +316,8 @@ nis_print_object (const nis_object * obj)
   nis_print_rights (obj->zo_access);
   printf (_("\nTime to Live  : "));
   print_ttl (obj->zo_ttl);
-  printf (_("Creation Time : %s"), ctime (&obj->zo_oid.ctime));
-  printf (_("Mod. Time     : %s"), ctime (&obj->zo_oid.mtime));
+  printf (_("Creation Time : %s"), ctime ((time_t *)&obj->zo_oid.ctime));
+  printf (_("Mod. Time     : %s"), ctime ((time_t *)&obj->zo_oid.mtime));
   fputs (_("Object Type   : "), stdout);
   nis_print_objtype (obj->zo_data.zo_type);
   switch (obj->zo_data.zo_type)
diff --git a/nis/nis_table.c b/nis/nis_table.c
index e0885ca024..d5b8f35a55 100644
--- a/nis/nis_table.c
+++ b/nis/nis_table.c
@@ -25,7 +25,7 @@
 
 
 static struct ib_request *
-__create_ib_request (const_nis_name name, u_long flags)
+__create_ib_request (const_nis_name name, unsigned int flags)
 {
   struct ib_request *ibreq = calloc (1, sizeof (ib_request));
   char buf[strlen (name) + 1];
@@ -145,7 +145,7 @@ __get_tablepath (char *name, dir_binding *bptr)
 }
 
 nis_result *
-nis_list (const_nis_name name, u_long flags,
+nis_list (const_nis_name name, unsigned int flags,
 	  int (*callback) (const_nis_name name,
 			   const nis_object *object,
 			   const void *userdata),
@@ -432,7 +432,7 @@ nis_list (const_nis_name name, u_long flags,
 }
 
 nis_result *
-nis_add_entry (const_nis_name name, const nis_object *obj2, u_long flags)
+nis_add_entry (const_nis_name name, const nis_object *obj2, unsigned int flags)
 {
   nis_object obj;
   nis_result *res;
@@ -492,7 +492,8 @@ nis_add_entry (const_nis_name name, const nis_object *obj2, u_long flags)
 }
 
 nis_result *
-nis_modify_entry (const_nis_name name, const nis_object *obj2, u_long flags)
+nis_modify_entry (const_nis_name name, const nis_object *obj2,
+		  unsigned int flags)
 {
   nis_object obj;
   nis_result *res;
@@ -546,7 +547,7 @@ nis_modify_entry (const_nis_name name, const nis_object *obj2, u_long flags)
 
 nis_result *
 nis_remove_entry (const_nis_name name, const nis_object *obj,
-		  u_long flags)
+		  unsigned int flags)
 {
   nis_result *res;
   ib_request *ibreq;
diff --git a/nis/nis_util.c b/nis/nis_util.c
index 2b351e7339..86197fcedc 100644
--- a/nis/nis_util.c
+++ b/nis/nis_util.c
@@ -55,12 +55,12 @@ __nis_finddirectory (directory_obj *dir, const_nis_name name)
  *
  * OZ's original sdbm hash
  */
-unsigned long
+uint32_t
 __nis_hash (const void *keyarg, register size_t len)
 {
   register const u_char *key;
   register size_t loop;
-  register u_int32_t h;
+  register uint32_t h;
 
 #define HASHC   h = *key++ + 65599 * h
 
diff --git a/nis/nis_xdr.c b/nis/nis_xdr.c
index efeb7d09dd..898518213a 100644
--- a/nis/nis_xdr.c
+++ b/nis/nis_xdr.c
@@ -63,7 +63,7 @@ xdr_nstype (XDR *xdrs, nstype *objp)
 static bool_t
 xdr_oar_mask (XDR *xdrs, oar_mask *objp)
 {
-  if (!xdr_u_long (xdrs, &objp->oa_rights))
+  if (!xdr_u_int (xdrs, &objp->oa_rights))
     return FALSE;
   if (!xdr_zotypes (xdrs, &objp->oa_otype))
     return FALSE;
@@ -90,7 +90,7 @@ _xdr_nis_server (XDR *xdrs, nis_server *objp)
   if (!xdr_array (xdrs, (char **) &objp->ep.ep_val, (u_int *) &objp->ep.ep_len,
 		  ~0, sizeof (endpoint), (xdrproc_t) xdr_endpoint))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->key_type))
+  if (!xdr_u_int (xdrs, &objp->key_type))
     return FALSE;
   if (!xdr_netobj (xdrs, &objp->pkey))
     return FALSE;
@@ -109,7 +109,7 @@ _xdr_directory_obj (XDR *xdrs, directory_obj *objp)
 		  sizeof (nis_server), (xdrproc_t) _xdr_nis_server))
     return FALSE;
 
-  if (!xdr_u_long (xdrs, &objp->do_ttl))
+  if (!xdr_uint32_t (xdrs, &objp->do_ttl))
     return FALSE;
   if (!xdr_array (xdrs, (char **) &objp->do_armask.do_armask_val,
 		  (u_int *) & objp->do_armask.do_armask_len, ~0,
@@ -121,7 +121,7 @@ _xdr_directory_obj (XDR *xdrs, directory_obj *objp)
 static bool_t
 xdr_entry_col (XDR *xdrs, entry_col *objp)
 {
-  if (!xdr_u_long (xdrs, &objp->ec_flags))
+  if (!xdr_u_int (xdrs, &objp->ec_flags))
     return FALSE;
   if (!xdr_bytes (xdrs, (char **) &objp->ec_value.ec_value_val,
 		  (u_int *) &objp->ec_value.ec_value_len, ~0))
@@ -144,7 +144,7 @@ xdr_entry_obj (XDR *xdrs, entry_obj *objp)
 static bool_t
 xdr_group_obj (XDR *xdrs, group_obj *objp)
 {
-  if (!xdr_u_long (xdrs, &objp->gr_flags))
+  if (!xdr_u_int (xdrs, &objp->gr_flags))
     return FALSE;
   if (!xdr_array (xdrs, (char **) &objp->gr_members.gr_members_val,
 		  (u_int *) &objp->gr_members.gr_members_len, ~0,
@@ -172,9 +172,9 @@ xdr_table_col (XDR *xdrs, table_col *objp)
 {
   if (!xdr_string (xdrs, &objp->tc_name, 64))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->tc_flags))
+  if (!xdr_u_int (xdrs, &objp->tc_flags))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->tc_rights))
+  if (!xdr_u_int (xdrs, &objp->tc_rights))
     return FALSE;
   return TRUE;
 }
@@ -242,9 +242,9 @@ xdr_objdata (XDR *xdrs, objdata *objp)
 static bool_t
 xdr_nis_oid (XDR *xdrs, nis_oid *objp)
 {
-  if (!xdr_u_long (xdrs, &objp->ctime))
+  if (!xdr_uint32_t (xdrs, &objp->ctime))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->mtime))
+  if (!xdr_uint32_t (xdrs, &objp->mtime))
     return FALSE;
   return TRUE;
 }
@@ -262,9 +262,9 @@ _xdr_nis_object (XDR *xdrs, nis_object *objp)
     return FALSE;
   if (!_xdr_nis_name (xdrs, &objp->zo_domain))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->zo_access))
+  if (!xdr_u_int (xdrs, &objp->zo_access))
     return FALSE;
-  if (!xdr_u_long (xdrs, &objp->zo_ttl))
+  if (!xdr_uint32_t (xdrs, &objp->zo_ttl))
     return FALSE;
   if (!xdr_objdata (xdrs, &objp->zo_data))
     return FALSE;
@@ -282,71 +282,6 @@ _xdr_nis_error (XDR *xdrs, nis_error *objp)
 bool_t
 _xdr_nis_result (XDR *xdrs, nis_result *objp)
 {
-  register long *buf;
-
-  if (xdrs->x_op == XDR_ENCODE)
-    {
-      if (!_xdr_nis_error (xdrs, &objp->status))
-	return FALSE;
-      if (!xdr_array (xdrs, (char **) &objp->objects.objects_val,
-		      (u_int *) &objp->objects.objects_len, ~0,
-		      sizeof (nis_object), (xdrproc_t) _xdr_nis_object))
-	return FALSE;
-      if (!xdr_netobj (