summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2020-11-20 13:03:01 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2020-11-20 13:03:01 +0000
commit378b81a95582f26e05ce714514dad605b1a2e905 (patch)
tree40dea4d735bce5388f186ae28214ee0b468079a4
parentbfb04d7142b25d9b357290efd88f01385f1fbf18 (diff)
add -s to synopsis and usage; -S before -s in options list;
-rw-r--r--sbin/iked/iked.813
-rw-r--r--sbin/iked/iked.c4
2 files changed, 9 insertions, 8 deletions
diff --git a/sbin/iked/iked.8 b/sbin/iked/iked.8
index 629e2d06518..87b24966767 100644
--- a/sbin/iked/iked.8
+++ b/sbin/iked/iked.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: iked.8,v 1.27 2020/11/20 12:38:26 tobhe Exp $
+.\" $OpenBSD: iked.8,v 1.28 2020/11/20 13:03:00 jmc Exp $
.\"
.\" Copyright (c) 2010 - 2014 Reyk Floeter <reyk@openbsd.org>
.\"
@@ -26,6 +26,7 @@
.Op Fl D Ar macro Ns = Ns Ar value
.Op Fl f Ar file
.Op Fl p Ar udpencap_port
+.Op Fl s Ar socket
.Sh DESCRIPTION
.Nm
is an Internet Key Exchange (IKEv2) daemon which performs mutual
@@ -86,11 +87,6 @@ than 4500, the
.Xr sysctl 2
variable has to be set accordingly.
Implies -t.
-.It Fl s Ar socket
-Use
-.Ar socket
-as the control socket, instead of the default
-.Pa /var/run/iked.sock .
.It Fl S
Start
.Nm
@@ -100,6 +96,11 @@ See the
option in
.Xr iked.conf 5
for more information.
+.It Fl s Ar socket
+Use
+.Ar socket
+as the control socket, instead of the default
+.Pa /var/run/iked.sock .
.It Fl T
Disable NAT-Traversal and do not propose NAT-Traversal support to the peers.
.It Fl t
diff --git a/sbin/iked/iked.c b/sbin/iked/iked.c
index 5c347198a8c..5b69fec6d5e 100644
--- a/sbin/iked/iked.c
+++ b/sbin/iked/iked.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: iked.c,v 1.49 2020/11/20 12:38:26 tobhe Exp $ */
+/* $OpenBSD: iked.c,v 1.50 2020/11/20 13:03:00 jmc Exp $ */
/*
* Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de>
@@ -57,7 +57,7 @@ usage(void)
extern char *__progname;
fprintf(stderr, "usage: %s [-dnSTtv] [-D macro=value] "
- "[-f file] [-p udpencap_port]\n", __progname);
+ "[-f file] [-p udpencap_port] [-s socket]\n", __progname);
exit(1);
}