diff options
| author | Chad Loder <cloder@cvs.openbsd.org> | 2005-03-18 17:27:40 +0000 |
|---|---|---|
| committer | Chad Loder <cloder@cvs.openbsd.org> | 2005-03-18 17:27:40 +0000 |
| commit | c20402813278192227873e7c5e3c657fd1c6f065 (patch) | |
| tree | f8cbe7f385faf84af5d2c6e05e6b4e5846f2f84d | |
| parent | 41020e49fe70f9b24df3a7a05f8089360f12b63c (diff) | |
Back out a possible bogus minor diff until we investigate what
broke.
OK deraadt@
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 22fb9c3b1a5..8384fa67fc8 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.106 2005/03/05 23:39:34 cloder Exp $ */ +/* $OpenBSD: ipsec.c,v 1.107 2005/03/18 17:27:39 cloder Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -809,7 +809,7 @@ ipsec_validate_id_information(u_int8_t type, u_int8_t *extra, u_int8_t *buf, LOG_DBG((LOG_MESSAGE, 40, "ipsec_validate_id_information: proto %d port %d type %d", - proto, ntohs(port), type)); + proto, port, type)); if (type < IPSEC_ID_IPV4_ADDR || type > IPSEC_ID_KEY_ID) return -1; @@ -843,7 +843,7 @@ ipsec_validate_id_information(u_int8_t type, u_int8_t *extra, u_int8_t *buf, } if (exchange->phase == 1 - && (proto != IPPROTO_UDP || ntohs(port) != UDP_DEFAULT_PORT) + && (proto != IPPROTO_UDP || port != UDP_DEFAULT_PORT) && (proto != 0 || port != 0)) { /* * XXX SSH's ISAKMP tester fails this test (proto 17 - port @@ -1812,7 +1812,7 @@ ipsec_get_proto_port(char *section, u_int8_t *tproto, u_int16_t *port) pstr = conf_get_str(section, "Port"); if (!pstr) return 0; - *port = htons((u_int16_t)atoi(pstr)); + *port = (u_int16_t)atoi(pstr); if (!*port) { se = getservbyname(pstr, pe ? pe->p_name : (pstr ? pstr : NULL)); |