diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 21:34:46 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-02-10 21:34:46 +0000 |
| commit | 075390a3f8ea4f56265d8776c762ab4dc10d8227 (patch) | |
| tree | 70100d56d311d93835c0924763e97ae7a25920f4 /canohost.c | |
| parent | d1f20ec3683183332f78ef82487a982b929c60cc (diff) | |
| download | openssh-git-075390a3f8ea4f56265d8776c762ab4dc10d8227.tar.gz | |
- markus@cvs.openbsd.org 2001/02/8 22:37:10
[canohost.c]
remove last call to sprintf; ok deraadt@
Diffstat (limited to 'canohost.c')
| -rw-r--r-- | canohost.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -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" @@ -142,10 +142,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) @@ -155,10 +155,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", |