summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2010-06-23 16:22:29 +0000
committerjmc <jmc@openbsd.org>2010-06-23 16:22:29 +0000
commitf8dba68e469b23bbfc6c884c811996c8c4791778 (patch)
tree7f89800bad1d7817eee6b23891cba82b651a10f9
parentAdd a ca export command for EAP mode where we only require the CA cert, (diff)
downloadwireguard-openbsd-f8dba68e469b23bbfc6c884c811996c8c4791778.tar.xz
wireguard-openbsd-f8dba68e469b23bbfc6c884c811996c8c4791778.zip
sort the options list, and add some new options to usage();
-rw-r--r--usr.sbin/ldapctl/ldapctl.812
-rw-r--r--usr.sbin/ldapctl/ldapctl.c5
2 files changed, 9 insertions, 8 deletions
diff --git a/usr.sbin/ldapctl/ldapctl.8 b/usr.sbin/ldapctl/ldapctl.8
index 6c082268c34..b2312653b55 100644
--- a/usr.sbin/ldapctl/ldapctl.8
+++ b/usr.sbin/ldapctl/ldapctl.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ldapctl.8,v 1.2 2010/06/23 13:31:30 martinh Exp $
+.\" $OpenBSD: ldapctl.8,v 1.3 2010/06/23 16:22:29 jmc Exp $
.\"
.\" Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
.\"
@@ -36,6 +36,11 @@ daemon.
.Pp
The options are as follows:
.Bl -tag -width Ds
+.It Fl f Ar file
+Use
+.Ar file
+as the configuration file, instead of the default
+.Pa /etc/ldapd.conf .
.It Fl s Ar socket
Use
.Ar socket
@@ -43,11 +48,6 @@ instead of the default
.Pa /var/run/ldapd.sock
to communicate with
.Xr ldapd 8 .
-.It Fl f Ar file
-Use
-.Ar file
-as the configuration file, instead of the default
-.Pa /etc/ldapd.conf .
.It Fl v
Produce more verbose output.
.El
diff --git a/usr.sbin/ldapctl/ldapctl.c b/usr.sbin/ldapctl/ldapctl.c
index fcbbc3dac10..98d072a5ce0 100644
--- a/usr.sbin/ldapctl/ldapctl.c
+++ b/usr.sbin/ldapctl/ldapctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldapctl.c,v 1.2 2010/06/23 13:31:30 martinh Exp $ */
+/* $OpenBSD: ldapctl.c,v 1.3 2010/06/23 16:22:29 jmc Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -66,7 +66,8 @@ usage(void)
{
extern char *__progname;
- fprintf(stderr, "usage: %s [-s socket] command [arg ...]\n",
+ fprintf(stderr,
+ "usage: %s [-v] [-f file] [-s socket] command [argument ...]\n",
__progname);
exit(1);
}