krb5 commit: Remove use of caddr_t in kpropd.c

Greg Hudson ghudson at mit.edu
Fri Apr 14 12:14:35 EDT 2017


https://github.com/krb5/krb5/commit/53f0eed03a54c8a4a97bb0599b643f68fca06c48
commit 53f0eed03a54c8a4a97bb0599b643f68fca06c48
Author: Robbie Harwood <rharwood at redhat.com>
Date:   Thu Apr 6 14:36:05 2017 -0400

    Remove use of caddr_t in kpropd.c

 src/slave/kpropd.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 056c31a..996f8df 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -483,8 +483,7 @@ doit(int fd)
         perror("getpeername");
         exit(1);
     }
-    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (caddr_t) &on,
-                   sizeof(on)) < 0) {
+    if (setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &on, sizeof(on)) < 0) {
         com_err(progname, errno,
                 _("while attempting setsockopt (SO_KEEPALIVE)"));
     }
@@ -589,13 +588,12 @@ full_resync(CLIENT *clnt)
     memset(&clnt_res, 0, sizeof(clnt_res));
 
     status = clnt_call(clnt, IPROP_FULL_RESYNC_EXT, (xdrproc_t)xdr_u_int32,
-                       (caddr_t)&vers, (xdrproc_t)xdr_kdb_fullresync_result_t,
-                       (caddr_t)&clnt_res, full_resync_timeout);
+                       &vers, (xdrproc_t)xdr_kdb_fullresync_result_t,
+                       &clnt_res, full_resync_timeout);
     if (status == RPC_PROCUNAVAIL) {
         status = clnt_call(clnt, IPROP_FULL_RESYNC, (xdrproc_t)xdr_void,
-                           (caddr_t *)&vers,
-                           (xdrproc_t)xdr_kdb_fullresync_result_t,
-                           (caddr_t)&clnt_res, full_resync_timeout);
+                           &vers, (xdrproc_t)xdr_kdb_fullresync_result_t,
+                           &clnt_res, full_resync_timeout);
     }
 
     return (status == RPC_SUCCESS) ? &clnt_res : NULL;


More information about the cvs-krb5 mailing list