Zap -P option. It has never done anything. While there tweak descripton of

-N.

zap -P ok ho@

4 files changed, 8 insertions, 24 deletions

diff --git a/sbin/isakmpd/isakmpd.8 b/sbin/isakmpd/isakmpd.8
index 680d04404fc..92901762b38 100644
--- a/sbin/isakmpd/isakmpd.8
+++ b/sbin/isakmpd/isakmpd.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: isakmpd.8,v 1.66 2005/02/24 13:55:51 hshoexer Exp $
+.\" $OpenBSD: isakmpd.8,v 1.67 2005/02/25 14:14:31 hshoexer Exp $
 .\" $EOM: isakmpd.8,v 1.23 2000/05/02 00:30:23 niklas Exp $
 .\"
 .\" Copyright (c) 1998, 1999, 2000, 2001 Niklas Hallqvist.
@@ -48,9 +48,8 @@
 .Op Fl f Ar fifo
 .Op Fl i Ar pid-file
 .Op Fl n
-.Op Fl N
+.Op Fl N Ar udpencap-port
 .Op Fl p Ar listen-port
-.Op Fl P Ar local-port
 .Op Fl K
 .Op Fl L
 .Op Fl l Ar packetlog-file
@@ -229,11 +228,6 @@ option specifies the listen port for encapsulated udp the daemon will bind to.
 The
 .Fl p
 option specifies the listen port the daemon will bind to.
-.It Fl P Ar local-port
-On the other hand, the port specified to capital
-.Fl P
-will be what the daemon binds its local end to when acting as
-initiator.
 .It Fl K
 When this option is given,
 .Nm
@@ -602,7 +596,3 @@ unprivileged ports (>1024).
 It is not possible to change the interfaces
 .Nm
 listens on without a restart.
-.Sh BUGS
-The
-.Fl P
-flag does not do what we document, rather it does nothing.
diff --git a/sbin/isakmpd/isakmpd.c b/sbin/isakmpd/isakmpd.c
index d0e33be6c7a..55c8d0a6e1e 100644
--- a/sbin/isakmpd/isakmpd.c
+++ b/sbin/isakmpd/isakmpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: isakmpd.c,v 1.70 2005/02/24 13:55:51 hshoexer Exp $	 */
+/* $OpenBSD: isakmpd.c,v 1.71 2005/02/25 14:14:31 hshoexer Exp $	 */
 /* $EOM: isakmpd.c,v 1.54 2000/10/05 09:28:22 niklas Exp $	 */
 
 /*
@@ -120,8 +120,8 @@ usage(void)
 	fprintf(stderr,
 	    "usage: %s [-4] [-6] [-a] [-c config-file] [-d] [-D class=level]\n"
 	    "          [-f fifo] [-i pid-file] [-K] [-n] [-N udpencap-port]\n"
-	    "          [-p listen-port] [-P local-port] [-L]\n"
-	    "          [-l packetlog-file] [-r seed] [-R report-file] [-v]\n",
+	    "          [-p listen-port] [-L] [-l packetlog-file] [-r seed]\n"
+	    "          [-R report-file] [-v]\n",
 	    sysdep_progname());
 	exit(1);
 }
@@ -199,10 +199,6 @@ parse_args(int argc, char *argv[])
 			udp_default_port = optarg;
 			break;
 
-		case 'P':
-			udp_bind_port = optarg;
-			break;
-
 #ifdef USE_DEBUG
 		case 'l':
 			pcap_file = optarg;
diff --git a/sbin/isakmpd/udp.c b/sbin/isakmpd/udp.c
index b0bb5f7a1d6..1ce03ef7740 100644
--- a/sbin/isakmpd/udp.c
+++ b/sbin/isakmpd/udp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp.c,v 1.80 2004/12/14 10:17:28 mcbride Exp $	 */
+/* $OpenBSD: udp.c,v 1.81 2005/02/25 14:14:31 hshoexer Exp $	 */
 /* $EOM: udp.c,v 1.57 2001/01/26 10:09:57 niklas Exp $	 */
 
 /*
@@ -105,8 +105,7 @@ static struct transport_vtbl udp_transport_vtbl = {
 };
 
 char		*udp_default_port = 0;
-char		*udp_bind_port = 0;
-int		bind_family = 0;
+int		 bind_family = 0;
 
 void
 udp_init(void)
diff --git a/sbin/isakmpd/udp.h b/sbin/isakmpd/udp.h
index dd91a6ce7e4..f3e2a6cf96d 100644
--- a/sbin/isakmpd/udp.h
+++ b/sbin/isakmpd/udp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp.h,v 1.10 2004/08/03 10:54:09 ho Exp $	 */
+/* $OpenBSD: udp.h,v 1.11 2005/02/25 14:14:31 hshoexer Exp $	 */
 /* $EOM: udp.h,v 1.4 1998/12/22 02:23:43 niklas Exp $	 */
 
 /*
@@ -33,7 +33,6 @@
 #define _UDP_H_
 
 extern char    *udp_default_port;
-extern char    *udp_bind_port;
 extern int      bind_family;
 
 #define BIND_FAMILY_INET4	0x0001