summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-06 18:55:05 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-09-06 18:55:05 +0000
commitf77a5f06221c206b2db71e900e53ad009cafa43d (patch)
tree3b47821b741379d40310b785577c40254fbe7fbe /usr.bin
parent39885284ac132a9ed6cf33cefd89b19ac1868856 (diff)
use socklen_t where needed
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/rsh/kcmd.c8
-rw-r--r--usr.bin/tftp/tftpsubs.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.bin/rsh/kcmd.c b/usr.bin/rsh/kcmd.c
index 6e0f17f355d..9c2235faeb4 100644
--- a/usr.bin/rsh/kcmd.c
+++ b/usr.bin/rsh/kcmd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: kcmd.c,v 1.4 2002/07/15 22:54:26 deraadt Exp $ */
+/* $OpenBSD: kcmd.c,v 1.5 2002/09/06 18:55:04 deraadt Exp $ */
/* $NetBSD: kcmd.c,v 1.2 1995/03/21 07:58:32 cgd Exp $ */
/*
@@ -39,7 +39,7 @@
static char Xsccsid[] = "derived from @(#)rcmd.c 5.17 (Berkeley) 6/27/88";
static char sccsid[] = "@(#)kcmd.c 8.2 (Berkeley) 8/19/93";
#else
-static char rcsid[] = "$OpenBSD: kcmd.c,v 1.4 2002/07/15 22:54:26 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: kcmd.c,v 1.5 2002/09/06 18:55:04 deraadt Exp $";
#endif
#endif /* not lint */
@@ -171,7 +171,7 @@ kcmd(int *sock, char **ahost, u_short rport, char *locuser, char *remuser,
} else {
char num[8];
int s2 = getport(&lport), s3;
- int len = sizeof(from);
+ socklen_t len = sizeof(from);
if (s2 < 0) {
status = -1;
@@ -222,7 +222,7 @@ again:
/* set up the needed stuff for mutual auth, but only if necessary */
if (authopts & KOPT_DO_MUTUAL) {
- int sin_len;
+ socklen_t sin_len;
*faddr = sin;
sin_len = sizeof(struct sockaddr_in);
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 72edd8120da..9445cd898fc 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $ */
+/* $OpenBSD: tftpsubs.c,v 1.4 2002/09/06 18:55:04 deraadt Exp $ */
/* $NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tftpsubs.c 8.1 (Berkeley) 6/6/93";
#endif
-static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.3 2001/11/19 19:02:16 mpech Exp $";
+static char rcsid[] = "$OpenBSD: tftpsubs.c,v 1.4 2002/09/06 18:55:04 deraadt Exp $";
#endif /* not lint */
/* Simple minded read-ahead/write-behind subroutines for tftp user and
@@ -263,7 +263,7 @@ synchnet(f)
int i, j = 0;
char rbuf[PKTSIZE];
struct sockaddr_in from;
- int fromlen;
+ socklen_t fromlen;
while (1) {
(void) ioctl(f, FIONREAD, &i);