Use new __do_niscall* interface.

diff --git a/nis/nis_add.c b/nis/nis_add.c
index 9baf4e8..6693a25 100644 (file)
--- a/nis/nis_add.c
+++ b/nis/nis_add.c
@@ -59,7 +59,8 @@ nis_add (const_nis_name name, const nis_object *obj)
   if ((status = __do_niscall (req.ns_object.ns_object_val[0].zo_domain,
                              NIS_ADD, (xdrproc_t) xdr_ns_request,
                              (caddr_t) &req, (xdrproc_t) xdr_nis_result,
-                             (caddr_t) res, MASTER_ONLY)) != RPC_SUCCESS)
+                             (caddr_t) res, MASTER_ONLY,
+                             NULL)) != RPC_SUCCESS)
     res->status = status;
 
   req.ns_object.ns_object_val[0].zo_name = p1;

diff --git a/nis/nis_cache.c b/nis/nis_cache.c
index 4c0ea7b..e10b8c0 100644 (file)
--- a/nis/nis_cache.c
+++ b/nis/nis_cache.c
@@ -143,7 +143,7 @@ __cache_refresh (nis_name name)
   if (cache_clnt == NULL)
     result = NIS_FAIL;
   else if (clnt_call (cache_clnt, NIS_CACHE_REFRESH_ENTRY,
-                     (xdrproc_t) xdr_wrapstring, (caddr_t) name,
+                     (xdrproc_t) xdr_wrapstring, (caddr_t) &name,
                      (xdrproc_t) xdr_void, &clnt_res, TIMEOUT)
           != RPC_SUCCESS)
     {

diff --git a/nis/nis_checkpoint.c b/nis/nis_checkpoint.c
index ff0a9b3..15cdd58 100644 (file)
--- a/nis/nis_checkpoint.c
+++ b/nis/nis_checkpoint.c
@@ -53,7 +53,7 @@ nis_checkpoint(const_nis_name dirname)
          if (__do_niscall2 (&res2->objects.objects_val[0].DI_data.do_servers.do_servers_val[i],
                            1, NIS_CHECKPOINT, (xdrproc_t) xdr_nis_name,
                            (caddr_t) &dirname, (xdrproc_t) xdr_cp_result,
-                           (caddr_t) &cpres, 0) != RPC_SUCCESS)
+                           (caddr_t) &cpres, 0, NULL) != RPC_SUCCESS)
            res->status = NIS_RPCERROR;
          else
            {

diff --git a/nis/nis_lookup.c b/nis/nis_lookup.c
index 6224b1f..bdce5d5 100644 (file)
--- a/nis/nis_lookup.c
+++ b/nis/nis_lookup.c
@@ -63,7 +63,7 @@ nis_lookup (const_nis_name name, const u_long flags)
                             (xdrproc_t) xdr_ns_request,
                             (caddr_t) & req,
                             (xdrproc_t) xdr_nis_result,
-                            (caddr_t) res, flags);
+                            (caddr_t) res, flags, NULL);
       if (status != NIS_SUCCESS)
        res->status = status;
 

diff --git a/nis/nis_mkdir.c b/nis/nis_mkdir.c
index 685dae6..b762e93 100644 (file)
--- a/nis/nis_mkdir.c
+++ b/nis/nis_mkdir.c
@@ -30,7 +30,7 @@ nis_mkdir (const_nis_name dir, const nis_server *server)
     {
       if (__do_niscall (dir, NIS_MKDIR, (xdrproc_t) xdr_nis_name,
                        (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                       (caddr_t) &res, 0) != RPC_SUCCESS)
+                       (caddr_t) &res, 0, NULL) != RPC_SUCCESS)
        return NIS_RPCERROR;
     }
   else
@@ -38,7 +38,7 @@ nis_mkdir (const_nis_name dir, const nis_server *server)
       if (__do_niscall2 (server, 1, NIS_MKDIR,
                         (xdrproc_t) xdr_nis_name,
                         (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                        (caddr_t) &res, 0) != RPC_SUCCESS)
+                        (caddr_t) &res, 0, NULL) != RPC_SUCCESS)
        return NIS_RPCERROR;
     }
 

diff --git a/nis/nis_modify.c b/nis/nis_modify.c
index 0457279..739ae0c 100644 (file)
--- a/nis/nis_modify.c
+++ b/nis/nis_modify.c
@@ -58,7 +58,8 @@ nis_modify (const_nis_name name, const nis_object *obj)
 
   if ((status = __do_niscall (name, NIS_MODIFY, (xdrproc_t) xdr_ns_request,
                              (caddr_t) & req, (xdrproc_t) xdr_nis_result,
-                             (caddr_t) res, MASTER_ONLY)) != RPC_SUCCESS)
+                             (caddr_t) res, MASTER_ONLY,
+                             NULL)) != RPC_SUCCESS)
     res->status = status;
 
   req.ns_object.ns_object_val[0].zo_name = p1;

diff --git a/nis/nis_ping.c b/nis/nis_ping.c
index 4ec34ce..a06dfde 100644 (file)
--- a/nis/nis_ping.c
+++ b/nis/nis_ping.c
@@ -60,7 +60,7 @@ nis_ping (const_nis_name dirname, u_long utime, const nis_object *dirobj)
     __do_niscall2 (&obj->DI_data.do_servers.do_servers_val[i], 1,
                   NIS_PING, (xdrproc_t) xdr_ping_args,
                   (caddr_t) &args, (xdrproc_t) xdr_void,
-                  (caddr_t) NULL, 0);
+                  (caddr_t) NULL, 0, NULL);
   if (res)
     nis_freeresult (res);
 }

diff --git a/nis/nis_rmdir.c b/nis/nis_rmdir.c
index a8c239e..adf5924 100644 (file)
--- a/nis/nis_rmdir.c
+++ b/nis/nis_rmdir.c
@@ -30,7 +30,7 @@ nis_rmdir (const_nis_name dir, const nis_server *server)
     {
       if (__do_niscall (dir, NIS_RMDIR, (xdrproc_t) xdr_nis_name,
                        (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                       (caddr_t) &res, 0) != RPC_SUCCESS)
+                       (caddr_t) &res, 0, NULL) != RPC_SUCCESS)
        return NIS_RPCERROR;
     }
   else
@@ -38,7 +38,7 @@ nis_rmdir (const_nis_name dir, const nis_server *server)
       if (__do_niscall2 (server, 1, NIS_RMDIR,
                         (xdrproc_t) xdr_nis_name,
                         (caddr_t) &dir, (xdrproc_t) xdr_nis_error,
-                        (caddr_t) &res, 0) != RPC_SUCCESS)
+                        (caddr_t) &res, 0, NULL) != RPC_SUCCESS)
        return NIS_RPCERROR;
     }
 

diff --git a/nis/nis_util.c b/nis/nis_util.c
index b6eef9b..fd9ff26 100644 (file)
--- a/nis/nis_util.c
+++ b/nis/nis_util.c
@@ -31,15 +31,15 @@ __nis_finddirectory (directory_obj *dir, const_nis_name name)
   fd_args.dir_name = strdup (name);
   fd_args.requester = nis_local_host();
   fd_res = calloc (1, sizeof (fd_result));
-      
-  if ((status = __do_niscall2 (dir->do_servers.do_servers_val, 
-                              dir->do_servers.do_servers_len, 
+
+  if ((status = __do_niscall2 (dir->do_servers.do_servers_val,
+                              dir->do_servers.do_servers_len,
                               NIS_FINDDIRECTORY, (xdrproc_t) xdr_fd_args,
                               (caddr_t) &fd_args, (xdrproc_t) xdr_fd_result,
-                              (caddr_t) fd_res, 
-                              NO_AUTHINFO|USE_DGRAM)) != NIS_SUCCESS)
+                              (caddr_t) fd_res,
+                              NO_AUTHINFO|USE_DGRAM, NULL)) != NIS_SUCCESS)
     fd_res->status = status;
-      
+
   return fd_res;
 }
 
@@ -59,15 +59,15 @@ __nis_hash (const void *keyarg, register size_t len)
   register const u_char *key;
   register size_t loop;
   register u_int32_t h;
-  
+
 #define HASHC   h = *key++ + 65599 * h
-  
+
   h = 0;
   key = keyarg;
-  if (len > 0) 
+  if (len > 0)
     {
       loop = (len + 8 - 1) >> 3;
-      switch (len & (8 - 1)) 
+      switch (len & (8 - 1))
        {
        case 0:
          do {
@@ -98,4 +98,3 @@ __nis_hash (const void *keyarg, register size_t len)
     }
   return (h);
 }
-