diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:22:18 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-01-26 15:22:18 +0000 |
| commit | e7aa4860c83b6b7b08e3f3d449c3968c7696f920 (patch) | |
| tree | ee88a0ee0ca4b9a1831f21a7fbb53830bda457c0 /sbin/isakmpd | |
| parent | 3d4925d2cf4782dd2b2a8591ad73743792b6c5f8 (diff) | |
Merge with EOM 1.45
date: 2000/01/25 06:51:20; author: angelos; state: Exp; lines: +2 -3
Unneeded variable.
date: 2000/01/25 06:50:51; author: angelos; state: Exp; lines: +1 -27
Didn't realize there was a sysdep_cleartext() for setting the BYPASS
flags for socket security levels. Remove reduntant setsockopt() code.
date: 2000/01/11 04:47:41; author: angelos; state: Exp; lines: +30 -4
Set IPSEC_LEVEL_BYPASS on all our sockets, so IKE packets don't
accidentally get encrypted.
Diffstat (limited to 'sbin/isakmpd')
| -rw-r--r-- | sbin/isakmpd/udp.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c index 1c33c93218b..ffee2c48a58 100644 --- a/sbin/isakmpd/udp.c +++ b/sbin/isakmpd/udp.c @@ -1,5 +1,5 @@ -/* $OpenBSD: udp.c,v 1.16 1999/10/01 14:08:05 niklas Exp $ */ -/* $EOM: udp.c,v 1.42 1999/09/30 12:59:27 niklas Exp $ */ +/* $OpenBSD: udp.c,v 1.17 2000/01/26 15:22:17 niklas Exp $ */ +/* $EOM: udp.c,v 1.45 2000/01/25 06:51:20 angelos Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -128,8 +128,7 @@ static struct transport * udp_make (struct sockaddr_in *laddr) { struct udp_transport *t = 0; - int s; - int on; + int s, on; t = malloc (sizeof *t); if (!t) @@ -164,8 +163,8 @@ udp_make (struct sockaddr_in *laddr) { log_error ("udp_make: setsockopt (%d, %d, %d, %p, %d)", s, SOL_SOCKET, (laddr->sin_addr.s_addr == INADDR_ANY - && conf_get_str ("General", "Listen-on")) - ? SO_REUSEPORT : SO_REUSEADDR, + && conf_get_str ("General", "Listen-on")) + ? SO_REUSEPORT : SO_REUSEADDR, &on, sizeof on); goto err; } |