diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-08 22:37:11 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-02-08 22:37:11 +0000 |
| commit | 0b60de84ffa8320c891f0b05e55ca88ee404988d (patch) | |
| tree | cfb05749315bf88e7d4ab7a9ec4fa080b1831301 /usr.bin | |
| parent | 28926c9d9f4e53cd7d5fdd3dbd7e495ad51173bf (diff) | |
remove last call to sprintf; ok deraadt@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/canohost.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/ssh/canohost.c b/usr.bin/ssh/canohost.c index 56aeb38cc39..616bcd82a73 100644 --- a/usr.bin/ssh/canohost.c +++ b/usr.bin/ssh/canohost.c @@ -12,7 +12,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.21 2001/02/08 19:30:51 itojun Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.22 2001/02/08 22:37:10 markus Exp $"); #include "packet.h" #include "xmalloc.h" @@ -120,10 +120,10 @@ get_remote_hostname(int socket, int reverse_mapping_check) void check_ip_options(int socket, char *ipaddr) { - u_char options[200], *ucp; - char text[1024], *cp; + u_char options[200]; + char text[sizeof(options) * 3 + 1]; socklen_t option_size; - int ipproto; + int i, ipproto; struct protoent *ip; if ((ip = getprotobyname("ip")) != NULL) @@ -133,10 +133,10 @@ check_ip_options(int socket, char *ipaddr) option_size = sizeof(options); if (getsockopt(socket, ipproto, IP_OPTIONS, (void *)options, &option_size) >= 0 && option_size != 0) { - cp = text; - /* Note: "text" buffer must be at least 3x as big as options. */ - for (ucp = options; option_size > 0; ucp++, option_size--, cp += 3) - sprintf(cp, " %2.2x", *ucp); + text[0] = '\0'; + for (i = 0; i < option_size; i++) + snprintf(text + i*3, sizeof(text) - i*3, + " %2.2x", options[i]); log("Connection from %.100s with IP options:%.800s", ipaddr, text); packet_disconnect("Connection from %.100s with IP options:%.800s", |