- jaredy@cvs.openbsd.org 2005/09/30 20:34:26
[ssh-keyscan.1]
deploy .An -nosplit; ok jmc
+ - dtucker@cvs.openbsd.org 2005/10/03 07:44:42
+ [canohost.c]
+ Relocate check_ip_options call to prevent logging of garbage for
+ connections with IP options set. bz#1092 from David Leonard,
+ "looks good" deraadt@
20050930
- (dtucker) [openbsd-compat/openbsd-compat.h] Bug #1096: Add prototype
*/
#include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.44 2005/06/17 02:44:32 djm Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.45 2005/10/03 07:44:42 dtucker Exp $");
#include "packet.h"
#include "xmalloc.h"
cleanup_exit(255);
}
- if (from.ss_family == AF_INET)
- check_ip_options(sock, ntop);
-
ipv64_normalise_mapped(&from, &fromlen);
if (from.ss_family == AF_INET6)
NULL, 0, NI_NUMERICHOST) != 0)
fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
+ if (from.ss_family == AF_INET)
+ check_ip_options(sock, ntop);
+
if (!use_dns)
return xstrdup(ntop);