From 03a2de3818d3547af96f80c072688c6fdd6c6fe1 Mon Sep 17 00:00:00 2001 From: stefanf Date: Mon, 14 Feb 2005 17:42:58 +0000 Subject: Fix most cases where the address of an int is passed to a function expecting a socklen_t * argument. --- libexec/bootpd/bootpd.c | 3 ++- libexec/comsat/comsat.c | 2 +- libexec/fingerd/fingerd.c | 3 ++- libexec/ftpd/ftpd.c | 13 ++++++++----- libexec/rexecd/rexecd.c | 2 +- libexec/rlogind/rlogind.c | 6 ++++-- libexec/rpc.rquotad/rquotad.c | 2 +- libexec/rpc.rstatd/rstatd.c | 2 +- libexec/rpc.rusersd/rusersd.c | 2 +- libexec/rpc.rwalld/rwalld.c | 3 ++- libexec/rpc.sprayd/sprayd.c | 2 +- libexec/rshd/rshd.c | 5 +++-- 12 files changed, 27 insertions(+), 18 deletions(-) (limited to 'libexec') diff --git a/libexec/bootpd/bootpd.c b/libexec/bootpd/bootpd.c index c907ddf..239b267 100644 --- a/libexec/bootpd/bootpd.c +++ b/libexec/bootpd/bootpd.c @@ -185,7 +185,8 @@ main(argc, argv) struct servent *servp; struct hostent *hep; char *stmp; - int n, ba_len, ra_len; + socklen_t ba_len, ra_len; + int n; int nfound; fd_set readfds; int standalone; diff --git a/libexec/comsat/comsat.c b/libexec/comsat/comsat.c index 1221566..ed14b1a 100644 --- a/libexec/comsat/comsat.c +++ b/libexec/comsat/comsat.c @@ -88,8 +88,8 @@ int main(int argc, char *argv[]) { struct sockaddr_in from; + socklen_t fromlen; int cc; - int fromlen; char msgbuf[256]; /* verify proper invocation */ diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c index 9a28933..0979c64 100644 --- a/libexec/fingerd/fingerd.c +++ b/libexec/fingerd/fingerd.c @@ -71,7 +71,8 @@ main(int argc, char *argv[]) int ch; char *lp; struct sockaddr_storage ss; - int p[2], logging, pflag, secure, sval; + socklen_t sval; + int p[2], logging, pflag, secure; #define ENTRIES 50 char **ap, *av[ENTRIES + 1], **comp, line[1024], *prog; char rhost[MAXHOSTNAMELEN]; diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index 6842714..f3e437e 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -270,7 +270,8 @@ static int *socksetup(int, char *, const char *); int main(int argc, char *argv[], char **envp) { - int addrlen, ch, on = 1, tos; + socklen_t addrlen; + int ch, on = 1, tos; char *cp, line[LINE_MAX]; FILE *fd; char *bindname = NULL; @@ -1900,8 +1901,8 @@ dataconn(char *name, off_t size, char *mode) *sizebuf = '\0'; if (pdata >= 0) { union sockunion from; - int flags; - int s, fromlen = ctrl_addr.su_len; + socklen_t fromlen = ctrl_addr.su_len; + int flags, s; struct timeval timeout; fd_set set; @@ -2816,7 +2817,8 @@ myoob(void) void passive(void) { - int len, on; + socklen_t len; + int on; char *p, *a; if (pdata >= 0) /* close old port if one set */ @@ -2899,7 +2901,8 @@ pasv_error: void long_passive(char *cmd, int pf) { - int len, on; + socklen_t len; + int on; char *p, *a; if (pdata >= 0) /* close old port if one set */ diff --git a/libexec/rexecd/rexecd.c b/libexec/rexecd/rexecd.c index 4d678eb..0a6e4dd 100644 --- a/libexec/rexecd/rexecd.c +++ b/libexec/rexecd/rexecd.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) { struct sockaddr_storage from; - int fromlen; + socklen_t fromlen; int ch; openlog("rexecd", LOG_PID, LOG_AUTH); diff --git a/libexec/rlogind/rlogind.c b/libexec/rlogind/rlogind.c index 0a0d5a5..86948f7 100644 --- a/libexec/rlogind/rlogind.c +++ b/libexec/rlogind/rlogind.c @@ -140,7 +140,8 @@ main(int argc, char *argv[]) { extern int __check_rhosts_file; union sockunion from; - int ch, fromlen, on; + socklen_t fromlen; + int ch, on; openlog("rlogind", LOG_PID | LOG_CONS, LOG_AUTH); @@ -242,7 +243,8 @@ doit(int f, union sockunion *fromp) if (fromp->su_family == AF_INET) { u_char optbuf[BUFSIZ/3]; - int optsize = sizeof(optbuf), ipproto, i; + socklen_t optsize = sizeof(optbuf); + int ipproto, i; struct protoent *ip; if ((ip = getprotobyname("ip")) != NULL) diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index 653ea15..6ca4c74 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -69,7 +69,7 @@ main(int argc, char *argv[]) SVCXPRT *transp; int ok; struct sockaddr_storage from; - int fromlen; + socklen_t fromlen; fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index e8aea46..362cdc4 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -62,7 +62,7 @@ main(int argc, char *argv[]) SVCXPRT *transp; int ok; struct sockaddr_storage from; - int fromlen; + socklen_t fromlen; if (argc == 2) closedown = atoi(argv[1]); diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index 9ffc4b3..1835e8e 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -63,7 +63,7 @@ main(int argc, char *argv[]) SVCXPRT *transp; int ok; struct sockaddr_storage from; - int fromlen; + socklen_t fromlen; /* * See if inetd started us diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index 2984717..6bfe537 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -65,7 +65,8 @@ int main(int argc, char *argv[]) { SVCXPRT *transp; - int ok, salen; + socklen_t salen; + int ok; struct sockaddr_storage sa; if (argc == 2 && !strcmp(argv[1], "-n")) diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index 20210d9..9c7cee1 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -78,7 +78,7 @@ main(int argc, char *argv[]) SVCXPRT *transp; int ok; struct sockaddr_storage from; - int fromlen; + socklen_t fromlen; /* * See if inetd started us diff --git a/libexec/rshd/rshd.c b/libexec/rshd/rshd.c index bf20936..ea85388 100644 --- a/libexec/rshd/rshd.c +++ b/libexec/rshd/rshd.c @@ -127,7 +127,8 @@ main(int argc, char *argv[]) { extern int __check_rhosts_file; struct linger linger; - int ch, on = 1, fromlen; + socklen_t fromlen; + int ch, on = 1; struct sockaddr_storage from; openlog("rshd", LOG_PID | LOG_ODELAY, LOG_DAEMON); @@ -218,7 +219,7 @@ doit(struct sockaddr *fromp) #ifdef IP_OPTIONS if (af == AF_INET) { u_char optbuf[BUFSIZ/3]; - int optsize = sizeof(optbuf), ipproto, i; + socklen_t optsize = sizeof(optbuf), ipproto, i; struct protoent *ip; if ((ip = getprotobyname("ip")) != NULL) -- cgit v1.1