From 5f648d3799e1839f0f2633ef7fed19e6ec1baeac Mon Sep 17 00:00:00 2001
From: Assar Westerlund <assar@sics.se>
Date: Wed, 9 Aug 2000 20:53:11 +0000
Subject: [PATCH] use socklen_t where appropriate instead of int

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8923 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/ftp/ftp/ftp.c               | 7 ++++---
 appl/ftp/ftpd/ftpd.c             | 9 +++++----
 appl/kx/common.c                 | 2 +-
 appl/kx/kx.c                     | 4 ++--
 appl/kx/kxd.c                    | 8 ++++----
 appl/popper/pop_init.c           | 2 +-
 appl/rsh/rshd.c                  | 2 +-
 appl/telnet/libtelnet/kerberos.c | 2 +-
 appl/telnet/telnetd/telnetd.c    | 7 ++++---
 appl/test/gssapi_client.c        | 4 ++--
 appl/test/gssapi_server.c        | 6 +++---
 appl/test/nt_gss_client.c        | 2 +-
 appl/test/nt_gss_server.c        | 2 +-
 appl/test/uu_client.c            | 2 +-
 appl/test/uu_server.c            | 2 +-
 kadmin/version4.c                | 2 +-
 kpasswd/kpasswdd.c               | 2 +-
 lib/hdb/hdb-ldap.c               | 3 ++-
 lib/kadm5/ipropd_master.c        | 4 ++--
 lib/krb5/auth_context.c          | 2 +-
 lib/krb5/sock_principal.c        | 2 +-
 21 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/appl/ftp/ftp/ftp.c b/appl/ftp/ftp/ftp.c
index 5568c1cd5..617c04fc5 100644
--- a/appl/ftp/ftp/ftp.c
+++ b/appl/ftp/ftp/ftp.c
@@ -60,7 +60,7 @@ hookup (const char *host, int port)
     struct addrinfo hints;
     int error;
     char portstr[NI_MAXSERV];
-    int len;
+    socklen_t len;
     int s;
 
     memset (&hints, 0, sizeof(hints));
@@ -1240,7 +1240,7 @@ static int
 active_mode (void)
 {
     int tmpno = 0;
-    int len;
+    socklen_t len;
     int result;
 
 noport:
@@ -1366,7 +1366,8 @@ dataconn (const char *lmode)
 {
     struct sockaddr_storage from_ss;
     struct sockaddr *from = (struct sockaddr *)&from_ss;
-    int s, fromlen = sizeof (from_ss);
+    socklen_t fromlen = sizeof(from_ss);
+    int s;
 
     if (passivemode)
 	return (fdopen (data, lmode));
diff --git a/appl/ftp/ftpd/ftpd.c b/appl/ftp/ftpd/ftpd.c
index 605e761c3..9eb5f00b4 100644
--- a/appl/ftp/ftpd/ftpd.c
+++ b/appl/ftp/ftpd/ftpd.c
@@ -252,7 +252,8 @@ show_file(const char *file, int code)
 int
 main(int argc, char **argv)
 {
-    int his_addr_len, ctrl_addr_len, on = 1;
+    socklen_t his_addr_len, ctrl_addr_len;
+    int on = 1;
     int port;
     struct servent *sp;
 
@@ -1254,7 +1255,7 @@ dataconn(const char *name, off_t size, const char *mode)
 		struct sockaddr_storage from_ss;
 		struct sockaddr *from = (struct sockaddr *)&from_ss;
 		int s;
-		int fromlen = sizeof(from_ss);
+		socklen_t fromlen = sizeof(from_ss);
 
 		s = accept(pdata, from, &fromlen);
 		if (s < 0) {
@@ -1922,7 +1923,7 @@ myoob(int signo)
 void
 pasv(void)
 {
-	int len;
+	socklen_t len;
 	char *p, *a;
 	struct sockaddr_in *sin;
 
@@ -1972,7 +1973,7 @@ pasv_error:
 void
 epsv(char *proto)
 {
-	int len;
+	socklen_t len;
 
 	pdata = socket(ctrl_addr->sa_family, SOCK_STREAM, 0);
 	if (pdata < 0) {
diff --git a/appl/kx/common.c b/appl/kx/common.c
index b04be7691..d1c7aa996 100644
--- a/appl/kx/common.c
+++ b/appl/kx/common.c
@@ -732,7 +732,7 @@ int
 suspicious_address (int sock, struct sockaddr_in addr)
 {
     char data[40];
-    int len = sizeof(data);
+    socklen_t len = sizeof(data);
 
     return addr.sin_addr.s_addr != htonl(INADDR_LOOPBACK)
 #if defined(IP_OPTIONS) && defined(HAVE_GETSOCKOPT)
diff --git a/appl/kx/kx.c b/appl/kx/kx.c
index dd4c197e7..fa047ca09 100644
--- a/appl/kx/kx.c
+++ b/appl/kx/kx.c
@@ -98,7 +98,7 @@ connect_host (kx_context *kc)
     struct addrinfo hints;
     int error;
     char portstr[NI_MAXSERV];
-    int addrlen;
+    socklen_t addrlen;
     int s;
     struct sockaddr_storage thisaddr_ss;
     struct sockaddr *thisaddr = (struct sockaddr *)&thisaddr_ss;
@@ -445,7 +445,7 @@ doit_active (kx_context *kc)
 	fd_set fdset;
 	pid_t child;
 	int fd, thisfd = -1;
-	int zero = 0;
+	socklen_t zero = 0;
 
 	FD_ZERO(&fdset);
 	for (i = 0; i < nsockets; ++i)
diff --git a/appl/kx/kxd.c b/appl/kx/kxd.c
index 7c14671e5..593b94abc 100644
--- a/appl/kx/kxd.c
+++ b/appl/kx/kxd.c
@@ -112,7 +112,7 @@ recv_conn (int sock, kx_context *kc,
 {
      u_char msg[1024], *p;
      char user[256];
-     int addrlen;
+     socklen_t addrlen;
      struct passwd *passwd;
      struct sockaddr_in thisaddr, thataddr;
      char remotehost[MaxHostNameLen];
@@ -295,7 +295,7 @@ doit_conn (kx_context *kc,
     int sock, sock2;
     struct sockaddr_in addr;
     struct sockaddr_in thisaddr;
-    int addrlen;
+    socklen_t addrlen;
     u_char msg[1024], *p;
 
     sock = socket (AF_INET, SOCK_STREAM, 0);
@@ -509,7 +509,7 @@ doit_passive (kx_context *kc,
 		if (FD_ISSET(sockets[i].fd, &fds)) {
 		    if (sockets[i].flags == TCP) {
 			struct sockaddr_in peer;
-			int len = sizeof(peer);
+			socklen_t len = sizeof(peer);
 
 			fd = accept (sockets[i].fd,
 				     (struct sockaddr *)&peer,
@@ -524,7 +524,7 @@ doit_passive (kx_context *kc,
 			    errno = EINTR;
 			}
 		    } else if(sockets[i].flags == UNIX_SOCKET) {
-			int zero = 0;
+			socklen_t zero = 0;
 
 			fd = accept (sockets[i].fd, NULL, &zero);
 
diff --git a/appl/popper/pop_init.c b/appl/popper/pop_init.c
index 8f0b31a9e..25401a1e9 100644
--- a/appl/popper/pop_init.c
+++ b/appl/popper/pop_init.c
@@ -245,7 +245,7 @@ pop_init(POP *p,int argcount,char **argmessage)
 {
     struct sockaddr_storage cs_ss;
     struct sockaddr *cs = (struct sockaddr *)&cs_ss;
-    int                     len;
+    socklen_t		    len;
     char                *   trace_file_name = "/tmp/popper-trace";
     int			    portnum = 0;
     int 		    optind = 0;
diff --git a/appl/rsh/rshd.c b/appl/rsh/rshd.c
index d49ca874b..7fc2d5a5d 100644
--- a/appl/rsh/rshd.c
+++ b/appl/rsh/rshd.c
@@ -581,7 +581,7 @@ doit (int do_kerberos, int check_rhosts)
     struct sockaddr *thataddr = (struct sockaddr *)&thataddr_ss;
     struct sockaddr_storage erraddr_ss;
     struct sockaddr *erraddr = (struct sockaddr *)&erraddr_ss;
-    int addrlen;
+    socklen_t addrlen;
     int port;
     int errsock = -1;
     char client_user[COMMAND_SZ], server_user[USERNAME_SZ];
diff --git a/appl/telnet/libtelnet/kerberos.c b/appl/telnet/libtelnet/kerberos.c
index 7a0a648bf..79605e0b6 100644
--- a/appl/telnet/libtelnet/kerberos.c
+++ b/appl/telnet/libtelnet/kerberos.c
@@ -272,7 +272,7 @@ kerberos4_is(Authenticator *ap, unsigned char *data, int cnt)
     char realm[REALM_SZ];
     char instance[INST_SZ];
     int r;
-    int addr_len;
+    socklen_t addr_len;
 
     if (cnt-- < 1)
 	return;
diff --git a/appl/telnet/telnetd/telnetd.c b/appl/telnet/telnetd/telnetd.c
index 396af880a..6cc48b812 100644
--- a/appl/telnet/telnetd/telnetd.c
+++ b/appl/telnet/telnetd/telnetd.c
@@ -143,7 +143,8 @@ main(int argc, char **argv)
 {
     struct sockaddr_storage __ss;
     struct sockaddr *sa = (struct sockaddr *)&__ss;
-    int on = 1, sa_size;
+    int on = 1;
+    socklen_t sa_size;
     int ch;
 #if	defined(IPPROTO_IP) && defined(IP_TOS)
     int tos = -1;
@@ -362,9 +363,9 @@ main(int argc, char **argv)
      *	Get socket's security label
      */
     if (secflag)  {
-	int szss = sizeof(ss);
+	socklen_t szss = sizeof(ss);
 	int sock_multi;
-	int szi = sizeof(int);
+	socklen_t szi = sizeof(int);
 
 	memset(&dv, 0, sizeof(dv));
 
diff --git a/appl/test/gssapi_client.c b/appl/test/gssapi_client.c
index f130a85f4..0f5ea548f 100644
--- a/appl/test/gssapi_client.c
+++ b/appl/test/gssapi_client.c
@@ -85,7 +85,7 @@ static int
 proto (int sock, const char *hostname, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
 
     int context_established = 0;
     gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
@@ -140,7 +140,7 @@ proto (int sock, const char *hostname, const char *service)
     input_chan_bindings.acceptor_address.value = acct_buf;
     
 #if 0
-    input_chan_bindings.application_data.value = malloc(4);
+    input_chan_bindings.application_data.value = emalloc(4);
     * (unsigned short*)input_chan_bindings.application_data.value = local.sin_port;
     * ((unsigned short *)input_chan_bindings.application_data.value + 1) = remote.sin_port;
     input_chan_bindings.application_data.length = 4;
diff --git a/appl/test/gssapi_server.c b/appl/test/gssapi_server.c
index c1870dc40..68ec38930 100644
--- a/appl/test/gssapi_server.c
+++ b/appl/test/gssapi_server.c
@@ -105,7 +105,7 @@ static int
 proto (int sock, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
     gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
     gss_buffer_desc real_input_token, real_output_token;
     gss_buffer_t input_token = &real_input_token,
@@ -144,7 +144,7 @@ proto (int sock, const char *service)
     acct_buf[2] = (local.sin_addr.s_addr >>  8) & 0xFF;
     acct_buf[3] = (local.sin_addr.s_addr >>  0) & 0xFF;
     input_chan_bindings.acceptor_address.value = acct_buf;
-    input_chan_bindings.application_data.value = malloc(4);
+    input_chan_bindings.application_data.value = emalloc(4);
 #if 0
     * (unsigned short *)input_chan_bindings.application_data.value =
                           remote.sin_port;
@@ -156,7 +156,7 @@ proto (int sock, const char *service)
     input_chan_bindings.application_data.value = NULL;
 #endif
     
-    delegated_cred_handle = malloc(sizeof(*delegated_cred_handle));
+    delegated_cred_handle = emalloc(sizeof(*delegated_cred_handle));
     memset((char*)delegated_cred_handle, 0, sizeof(*delegated_cred_handle));
     
     do {
diff --git a/appl/test/nt_gss_client.c b/appl/test/nt_gss_client.c
index 879646aee..4edacfabc 100644
--- a/appl/test/nt_gss_client.c
+++ b/appl/test/nt_gss_client.c
@@ -46,7 +46,7 @@ static int
 proto (int sock, const char *hostname, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
 
     int context_established = 0;
     gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
diff --git a/appl/test/nt_gss_server.c b/appl/test/nt_gss_server.c
index dda31570e..41de3a965 100644
--- a/appl/test/nt_gss_server.c
+++ b/appl/test/nt_gss_server.c
@@ -66,7 +66,7 @@ static int
 proto (int sock, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
     gss_ctx_id_t context_hdl = GSS_C_NO_CONTEXT;
     gss_buffer_t input_token, output_token;
     gss_buffer_desc real_input_token, real_output_token;
diff --git a/appl/test/uu_client.c b/appl/test/uu_client.c
index 9dc1c5407..9bfa8c225 100644
--- a/appl/test/uu_client.c
+++ b/appl/test/uu_client.c
@@ -40,7 +40,7 @@ static int
 proto (int sock, const char *hostname, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
     krb5_address remote_addr, local_addr;
     krb5_context context;
     krb5_ccache ccache;
diff --git a/appl/test/uu_server.c b/appl/test/uu_server.c
index 15b78bfce..0b6ca4351 100644
--- a/appl/test/uu_server.c
+++ b/appl/test/uu_server.c
@@ -40,7 +40,7 @@ static int
 proto (int sock, const char *service)
 {
     struct sockaddr_in remote, local;
-    int addrlen;
+    socklen_t addrlen;
     krb5_address remote_addr, local_addr;
     krb5_ccache ccache;
     krb5_auth_context auth_context;
diff --git a/kadmin/version4.c b/kadmin/version4.c
index 665349094..b7320feae 100644
--- a/kadmin/version4.c
+++ b/kadmin/version4.c
@@ -929,7 +929,7 @@ handle_v4(krb5_context context,
 {
     int first = 1;
     struct sockaddr_in admin_addr, client_addr;
-    int addr_len;
+    socklen_t addr_len;
     krb5_data message, reply;
     ssize_t n;
 
diff --git a/kpasswd/kpasswdd.c b/kpasswd/kpasswdd.c
index 271d3b96d..f876d263b 100644
--- a/kpasswd/kpasswdd.c
+++ b/kpasswd/kpasswdd.c
@@ -473,7 +473,7 @@ doit (krb5_keytab keytab, int port)
 	for (i = 0; i < n; ++i)
 	    if (FD_ISSET(sockets[i], &fdset)) {
 		u_char buf[BUFSIZ];
-		int addrlen = sizeof(__ss);
+		socklen_t addrlen = sizeof(__ss);
 
 		ret = recvfrom (sockets[i], buf, sizeof(buf), 0,
 				sa, &addrlen);
diff --git a/lib/hdb/hdb-ldap.c b/lib/hdb/hdb-ldap.c
index f981368eb..8242859cd 100644
--- a/lib/hdb/hdb-ldap.c
+++ b/lib/hdb/hdb-ldap.c
@@ -962,7 +962,8 @@ static krb5_error_code LDAP__connect(krb5_context context, HDB * db)
     if (db->db != NULL) {
 	/* connection has been opened. ping server. */
 	struct sockaddr_un addr;
-	int sd, len;
+	socklen_t len;
+	int sd;
 
 	if (ldap_get_option((LDAP *) db->db, LDAP_OPT_DESC, &sd) == 0 &&
 	    getpeername(sd, (struct sockaddr *) &addr, &len) < 0) {
diff --git a/lib/kadm5/ipropd_master.c b/lib/kadm5/ipropd_master.c
index ba3a8e954..c0fd78937 100644
--- a/lib/kadm5/ipropd_master.c
+++ b/lib/kadm5/ipropd_master.c
@@ -116,7 +116,7 @@ add_slave (krb5_context context, krb5_keytab keytab, slave **root, int fd)
     krb5_principal server;
     krb5_error_code ret;
     slave *s;
-    int addr_len;
+    socklen_t addr_len;
     krb5_ticket *ticket = NULL;
     char hostname[128];
 
@@ -455,7 +455,7 @@ main(int argc, char **argv)
 
 	if (ret && FD_ISSET(signal_fd, &readset)) {
 	    struct sockaddr_un peer_addr;
-	    int peer_len = sizeof(peer_addr);
+	    socklen_t peer_len = sizeof(peer_addr);
 
 	    if(recvfrom(signal_fd, &vers, sizeof(vers), 0,
 			(struct sockaddr *)&peer_addr, &peer_len) < 0) {
diff --git a/lib/krb5/auth_context.c b/lib/krb5/auth_context.c
index 4712cc887..02763d3ae 100644
--- a/lib/krb5/auth_context.c
+++ b/lib/krb5/auth_context.c
@@ -139,7 +139,7 @@ krb5_auth_con_setaddrs_from_fd (krb5_context context,
     struct sockaddr_storage ss_local, ss_remote;
     struct sockaddr *local  = (struct sockaddr *)&ss_local;
     struct sockaddr *remote = (struct sockaddr *)&ss_remote;
-    int len;
+    socklen_t len;
 
     if (auth_context->local_address == NULL) {
 	len = sizeof(ss_local);
diff --git a/lib/krb5/sock_principal.c b/lib/krb5/sock_principal.c
index 4307330dc..40d149389 100644
--- a/lib/krb5/sock_principal.c
+++ b/lib/krb5/sock_principal.c
@@ -46,7 +46,7 @@ krb5_sock_to_principal (krb5_context context,
     krb5_address address;
     struct sockaddr_storage __ss;
     struct sockaddr *sa = (struct sockaddr *)&__ss;
-    int len = sizeof(__ss);
+    socklen_t len = sizeof(__ss);
     struct hostent *hostent;
     int family;
     char hname[256];