* configure.in: Add KRB5_GETSOCKNAME_ARGS and KRB5_GETPEERNAME_ARGS

	* kprop.c, kpropd.c: Use GETSOCKNAME_ARG3_TYPE and
	GETPEERNAME_ARG3_TYPE.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14051 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/slave/ChangeLog b/src/slave/ChangeLog
index f30bc7eab0f458dcef03be2df621cd6b168a2ba8..d7d7536e89493b80a0a1a5d794f477a04de4afb5 100644 (file)
--- a/src/slave/ChangeLog
+++ b/src/slave/ChangeLog
@@ -1,3 +1,10 @@
+2001-12-06  Ezra Peisach  <epeisach@mit.edu>
+
+       * configure.in: Add KRB5_GETSOCKNAME_ARGS and KRB5_GETPEERNAME_ARGS
+
+       * kprop.c, kpropd.c: Use GETSOCKNAME_ARG3_TYPE and
+       GETPEERNAME_ARG3_TYPE. 
+
 2001-10-09  Ken Raeburn  <raeburn@mit.edu>
 
        * kprop.c, kpropd.c: Make prototypes unconditional.

diff --git a/src/slave/configure.in b/src/slave/configure.in
index dcee8f75ac6404952d6835791b2e59144de02ee1..5c1f2df12b6b5b13d4b25e03a5c3015e2183c66e 100644 (file)
--- a/src/slave/configure.in
+++ b/src/slave/configure.in
@@ -4,5 +4,7 @@ AC_TYPE_MODE_T
 AC_PROG_INSTALL
 AC_CHECK_LIB(util,main)
 KRB5_NEED_PROTO([#include <unistd.h>],daemon,1)
+KRB5_GETSOCKNAME_ARGS
+KRB5_GETPEERNAME_ARGS
 KRB5_BUILD_PROGRAM
 V5_AC_OUTPUT_MAKEFILE

diff --git a/src/slave/kprop.c b/src/slave/kprop.c
index a8ee70046e55d3e01984dfaccb7cb2c43369fa3d..e730f46461564af9e72db3bd6d027aab9d6c12bd 100644 (file)
--- a/src/slave/kprop.c
+++ b/src/slave/kprop.c
@@ -46,6 +46,10 @@
 #include "com_err.h"
 #include "kprop.h"
 
+#ifndef GETSOCKNAME_ARG3_TYPE
+#define GETSOCKNAME_ARG3_TYPE unsigned int
+#endif
+
 static char *kprop_version = KPROP_PROT_VERSION;
 
 char   *progname = 0;
@@ -329,7 +333,7 @@ open_connection(host, fd, Errmsg, ErrmsgSz)
        struct hostent  *hp;
        register struct servent *sp;
        struct sockaddr_in my_sin;
-       unsigned int    socket_length;
+       GETSOCKNAME_ARG3_TYPE socket_length;
 
        hp = gethostbyname(host);
        if (hp == NULL) {

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 6adf48495c604fcdf45fa310cd79aacac0e726ed..6ded72aed2a032b4c10bfa1517fc5187a98885a2 100644 (file)
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -82,6 +82,13 @@
 
 #include "kprop.h"
 
+#ifndef GETSOCKNAME_ARG3_TYPE
+#define GETSOCKNAME_ARG3_TYPE unsigned int
+#endif
+#ifndef GETPEERNAME_ARG3_TYPE
+#define GETPEERNAME_ARG3_TYPE unsigned int
+#endif
+
 #if defined(NEED_DAEMON_PROTO)
 extern int daemon(int, int);
 #endif
@@ -173,7 +180,7 @@ void do_standalone()
        struct  sockaddr_in     my_sin, frominet;
        struct servent *sp;
        int     finet, s;
-       unsigned int fromlen;
+       GETPEERNAME_ARG3_TYPE fromlen;
        int     ret;
        
        finet = socket(AF_INET, SOCK_STREAM, 0);
@@ -264,7 +271,7 @@ void doit(fd)
 {
        struct sockaddr_in from;
        int on = 1;
-       unsigned int fromlen;
+       GETPEERNAME_ARG3_TYPE fromlen;
        struct hostent  *hp;
        krb5_error_code retval;
        krb5_data confmsg;
@@ -542,7 +549,7 @@ kerberos_authenticate(context, fd, clientp, etype, my_sin)
     krb5_error_code      retval;
     krb5_ticket                * ticket;
     struct sockaddr_in   r_sin;
-    unsigned int         sin_length;
+    GETSOCKNAME_ARG3_TYPE sin_length;
     krb5_keytab                  keytab = NULL;
 
     /*