X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/2b87da3b1fb7c5ca907cb65aa048fada4ad29803..1d3c30dbe232d224145556c245d27d1be1e01a1e:/canohost.c

diff --git a/canohost.c b/canohost.c
index 87f56054..52921f5b 100644
--- a/canohost.c
+++ b/canohost.c
@@ -12,11 +12,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.20 2001/02/03 10:08:37 markus Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.23 2001/02/10 01:33:32 markus Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
 #include "log.h"
+#include "canohost.h"
 
 void	check_ip_options(int socket, char *ipaddr);
 
@@ -70,6 +71,7 @@ get_remote_hostname(int socket, int reverse_mapping_check)
 	     NULL, 0, NI_NUMERICHOST) != 0)
 		fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
 
+	debug("Trying to reverse map address %.100s.", ntop);
 	/* Map the IP address to a host name. */
 	if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
 	     NULL, 0, NI_NAMEREQD) != 0) {
@@ -141,10 +143,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)
@@ -154,10 +156,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",