Use socklen_t when passing address to socket functions.

Fixes compilation warnings on AIX 4.3.3.

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

diff --git a/src/appl/bsd/ChangeLog b/src/appl/bsd/ChangeLog
index 46e005c5765e261edb1bd2e51ee9e09ca812e4b0..055fbcfea3bdc5420f52ae16f5929af7087d8236 100644 (file)
--- a/src/appl/bsd/ChangeLog
+++ b/src/appl/bsd/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * krlogind.c (main, recvauth): Use socklen_t when passing
+       addresses to socket functions.
+
 2003-01-05  Sam Hartman  <hartmans@mit.edu>
 
        * login.c: Remove declaration of errno

diff --git a/src/appl/bsd/krlogind.c b/src/appl/bsd/krlogind.c
index 33a1876527e4007cc927780271471852cd3a7e69..7c8365972fad3d7497d03de055f5567786ff457d 100644 (file)
--- a/src/appl/bsd/krlogind.c
+++ b/src/appl/bsd/krlogind.c
@@ -354,7 +354,8 @@ int main(argc, argv)
 {
     extern int opterr, optind;
     extern char * optarg;
-    int on = 1, fromlen, ch;
+    int on = 1, ch;
+    socklen_t fromlen;
     struct sockaddr_storage from;
     int debug_port = 0;
     int fd;
@@ -1354,7 +1355,7 @@ recvauth(valid_checksum)
     krb5_auth_context auth_context = NULL;
     krb5_error_code status;
     struct sockaddr_storage peersin, laddr;
-    int len;
+    socklen_t len;
     krb5_data inbuf;
     char v4_instance[INST_SZ]; /* V4 Instance */
     krb5_data version;
@@ -1461,7 +1462,7 @@ recvauth(valid_checksum)
     
       if (authenticator->checksum) {
        struct sockaddr_in adr;
-       int adr_length = sizeof(adr);
+       socklen_t adr_length = sizeof(adr);
        char * chksumbuf = (char *) malloc(strlen(term)+strlen(lusername)+32);
        if (getsockname(netf, (struct sockaddr *) &adr, &adr_length) != 0)
            goto error_cleanup;

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 385036d2b5b172941364f4a9dafe0f84bcb5d278..ba67eb5738d80da538f64afd0bac2e4f3eaee6a4 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * ftp.c (hookup, initconn, dataconn): Use socklen_t when passing
+       address to socket functions.
+
 2002-11-08  Ken Raeburn  <raeburn@mit.edu>
 
        * main.c (makeargv): Report an error if parsed arguments won't fit

diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index d7f48408026598bbf05021211aaaaa56dba12cc4..ffbb42cd586b3dc47ba6836264ae84107fc19c59 100644 (file)
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -196,7 +196,8 @@ char *
 hookup(char* host, int port)
 {
        register struct hostent *hp = 0;
-       int s, len;
+       int s;
+       socklen_t len;
 #ifdef IP_TOS
 #ifdef IPTOS_LOWDELAY
        int tos;
@@ -1440,7 +1441,8 @@ die:
 static int initconn()
 {
        register char *p, *a;
-       int result, len, tmpno = 0;
+       int result, tmpno = 0;
+       socklen_t len;
        int on = 1;
 #ifndef NO_PASSIVE_MODE
        int a1,a2,a3,a4,p1,p2;
@@ -1560,7 +1562,8 @@ bad:
 FILE *
 dataconn(char *lmode)
 {
-       int s, fromlen = sizeof (hisdataaddr);
+       int s;
+       socklen_t fromlen = sizeof (hisdataaddr);
 #ifdef IP_TOS
 #ifdef IPTOS_LOWDELAY
         int tos;

diff --git a/src/appl/telnet/telnetd/ChangeLog b/src/appl/telnet/telnetd/ChangeLog
index 71503b1b68e6a123fbde50e42dda08913016f9fa..c380d11f87397849eb0e354dc93231cf393a4c01 100644 (file)
--- a/src/appl/telnet/telnetd/ChangeLog
+++ b/src/appl/telnet/telnetd/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * telnetd.c (main): Use socklen_t when passing address to socket
+       functions.
+
 2003-01-07  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.orig: Deleted.

diff --git a/src/appl/telnet/telnetd/telnetd.c b/src/appl/telnet/telnetd/telnetd.c
index bed4a329487491d9b9be2721be133f420035bdcc..5633d562513d707f2ef59b72d7c3edde3de85b9f 100644 (file)
--- a/src/appl/telnet/telnetd/telnetd.c
+++ b/src/appl/telnet/telnetd/telnetd.c
@@ -221,7 +221,8 @@ main(argc, argv)
        char *argv[];
 {
        struct sockaddr_storage from;
-       int on = 1, fromlen;
+       int on = 1;
+       socklen_t fromlen;
        register int ch;
        extern char *optarg;
        extern int optind;
@@ -488,7 +489,8 @@ main(argc, argv)
 
        /* XXX Convert this to support getaddrinfo, ipv6, etc.  */
        if (debug) {
-           int s, ns, foo;
+           int s, ns;
+           socklen_t foo;
            struct servent *sp;
            static struct sockaddr_in sin4 = { AF_INET };
 

diff --git a/src/appl/user_user/ChangeLog b/src/appl/user_user/ChangeLog
index 433e589a3b084da32df46d12088c5ce23a659e27..f62cd3c3b508540aea26c2c06d9e90ec8e103f5a 100644 (file)
--- a/src/appl/user_user/ChangeLog
+++ b/src/appl/user_user/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * server.c (main): Use socklen_t when passing address to socket
+       functions.
+
 2002-08-29  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Revert $(S)=>/ change, for Windows support.

diff --git a/src/appl/user_user/server.c b/src/appl/user_user/server.c
index b81d1620035c0ef99ce0b4af954d69d0b831953d..022767df364fcac143f534e69847c0ac5bf0f70a 100644 (file)
--- a/src/appl/user_user/server.c
+++ b/src/appl/user_user/server.c
@@ -47,7 +47,8 @@ int argc;
 char *argv[];
 {
   krb5_data pname_data, tkt_data;
-  int l, sock = 0;
+  int sock = 0;
+  socklen_t l;
   int retval;
   struct sockaddr_in l_inaddr, f_inaddr;       /* local, foreign address */
   krb5_creds creds, *new_creds;
@@ -71,7 +72,7 @@ char *argv[];
       int one = 1;
       int acc;
       struct servent *sp;
-      int namelen = sizeof(f_inaddr);
+      socklen_t namelen = sizeof(f_inaddr);
       
       if ((sock = socket(PF_INET, SOCK_STREAM, 0)) < 0) {
          com_err("uu-server", errno, "creating socket");

diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog
index beeab171476f98617bdf7ea69729b2e0e48e9540..b1a8f7878238e7d0662407236d6e0a303d86b1ce 100644 (file)
--- a/src/kadmin/server/ChangeLog
+++ b/src/kadmin/server/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * ovsec_kadmd.c (do_schpw): Use socklen_t when passing address to
+       socket functions.
+
 2003-01-07  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.ov: Deleted.

diff --git a/src/kadmin/server/ovsec_kadmd.c b/src/kadmin/server/ovsec_kadmd.c
index 72d339a35471f2b4cc4fb725294fdf2b783c4887..776eace1edbe383d4d4c4cf262b4f47fd7658bf7 100644 (file)
--- a/src/kadmin/server/ovsec_kadmd.c
+++ b/src/kadmin/server/ovsec_kadmd.c
@@ -1027,7 +1027,7 @@ void do_schpw(int s1, kadm5_config_params *params)
     char req[1500];
     int len;
     struct sockaddr_in from;
-    int fromlen;
+    socklen_t fromlen;
     krb5_keytab kt;
     krb5_data reqdata, repdata;
     int s2;

diff --git a/src/kadmin/v4server/ChangeLog b/src/kadmin/v4server/ChangeLog
index ab49208359c437dbbb3379659d7d4a6a4eb2b27f..978aabfd7aa78642d12bdaa5b3e06f2dae751f44 100644 (file)
--- a/src/kadmin/v4server/ChangeLog
+++ b/src/kadmin/v4server/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * admin_server.c (kadm_listen): Use socklen_t when passing address
+       to socket functions.
+
 2003-01-07  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.ov: Deleted.

diff --git a/src/kadmin/v4server/admin_server.c b/src/kadmin/v4server/admin_server.c
index 527f19341a5abc39290a760b33bf2dcb9326f144..1dfb77faaef75ea983416ea0c950fd9ea3cd7b3b 100644 (file)
--- a/src/kadmin/v4server/admin_server.c
+++ b/src/kadmin/v4server/admin_server.c
@@ -289,7 +289,7 @@ kadm_listen()
     int peer_fd;
     fd_set mask, readfds;
     struct sockaddr_in peer;
-    int addrlen;
+    socklen_t addrlen;
     int pid;
 #ifdef POSIX_SIGNALS
     struct sigaction new_act;

diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog
index ced30673668798fbf3d5f9092e5ad29c6f592155..b301eab762630d883fe519484d03ff2b254ff3c9 100644 (file)
--- a/src/kadmin/v5passwdd/ChangeLog
+++ b/src/kadmin/v5passwdd/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-09  Ken Raeburn  <raeburn@mit.edu>
+
+       * adm_conn.c (kadm_contact_server): Use socklen_t when passing
+       address to socket functions.
+
 2002-11-05  Tom Yu  <tlyu@mit.edu>
 
        * kpasswd.c (kpwd_change_prompt_1, kpwd_change_prompt_2)

diff --git a/src/kadmin/v5passwdd/adm_conn.c b/src/kadmin/v5passwdd/adm_conn.c
index d9e6d8268756ebf764b2a578063a24c1a0ca3c99..17028c738c2cfd48f94599d41e887e9632c94921 100644 (file)
--- a/src/kadmin/v5passwdd/adm_conn.c
+++ b/src/kadmin/v5passwdd/adm_conn.c
@@ -326,7 +326,7 @@ kadm_contact_server(kcontext, realmp, sockp, local, remote)
 
     struct sockaddr_in in_local;
     struct sockaddr_in in_remote;
-    int                        addr_len;
+    socklen_t          addr_len;
 
     const char         *realm_admin_names[4];
     char               *realm_name;