RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/02/8 22:37:10 

[canohost.c]
     remove last call to sprintf; ok deraadt@
This commit is contained in:
Ben Lindstrom 2001-02-10 21:34:46 +00:00
parent d1f20ec368
commit 075390a3f8
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -6,6 +6,9 @@
- markus@cvs.openbsd.org 2001/02/10 12:52:02 - markus@cvs.openbsd.org 2001/02/10 12:52:02
[auth2.c] [auth2.c]
offer passwd before s/key offer passwd before s/key
- markus@cvs.openbsd.org 2001/02/8 22:37:10
[canohost.c]
remove last call to sprintf; ok deraadt@
20010210 20010210
- (djm) Sync sftp and scp stuff from OpenBSD: - (djm) Sync sftp and scp stuff from OpenBSD:
@ -3789,4 +3792,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.714 2001/02/10 21:31:53 mouring Exp $ $Id: ChangeLog,v 1.715 2001/02/10 21:34:46 mouring Exp $

16
canohost.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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 "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
@ -142,10 +142,10 @@ get_remote_hostname(int socket, int reverse_mapping_check)
void void
check_ip_options(int socket, char *ipaddr) check_ip_options(int socket, char *ipaddr)
{ {
u_char options[200], *ucp; u_char options[200];
char text[1024], *cp; char text[sizeof(options) * 3 + 1];
socklen_t option_size; socklen_t option_size;
int ipproto; int i, ipproto;
struct protoent *ip; struct protoent *ip;
if ((ip = getprotobyname("ip")) != NULL) if ((ip = getprotobyname("ip")) != NULL)
@ -155,10 +155,10 @@ check_ip_options(int socket, char *ipaddr)
option_size = sizeof(options); option_size = sizeof(options);
if (getsockopt(socket, ipproto, IP_OPTIONS, (void *)options, if (getsockopt(socket, ipproto, IP_OPTIONS, (void *)options,
&option_size) >= 0 && option_size != 0) { &option_size) >= 0 && option_size != 0) {
cp = text; text[0] = '\0';
/* Note: "text" buffer must be at least 3x as big as options. */ for (i = 0; i < option_size; i++)
for (ucp = options; option_size > 0; ucp++, option_size--, cp += 3) snprintf(text + i*3, sizeof(text) - i*3,
sprintf(cp, " %2.2x", *ucp); " %2.2x", options[i]);
log("Connection from %.100s with IP options:%.800s", log("Connection from %.100s with IP options:%.800s",
ipaddr, text); ipaddr, text);
packet_disconnect("Connection from %.100s with IP options:%.800s", packet_disconnect("Connection from %.100s with IP options:%.800s",