summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsobrado <sobrado@openbsd.org>2009-10-16 09:46:40 +0000
committersobrado <sobrado@openbsd.org>2009-10-16 09:46:40 +0000
commitcd06f2a36690336c57a7804f8b93d5a2b05f7f23 (patch)
tree1405a320827c1e255d9a8b3bee494bacc2d4c8b8
parentGet serial console speed from prom, and use it instead of hardcoding 9600 bps, (diff)
downloadwireguard-openbsd-cd06f2a36690336c57a7804f8b93d5a2b05f7f23.tar.xz
wireguard-openbsd-cd06f2a36690336c57a7804f8b93d5a2b05f7f23.zip
sort flags in synopsis, usage, and description.
-rw-r--r--usr.sbin/ypserv/mknetid/mknetid.826
-rw-r--r--usr.sbin/ypserv/mknetid/mknetid.c10
2 files changed, 18 insertions, 18 deletions
diff --git a/usr.sbin/ypserv/mknetid/mknetid.8 b/usr.sbin/ypserv/mknetid/mknetid.8
index ba35a9a1834..7e8cd084412 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.8
+++ b/usr.sbin/ypserv/mknetid/mknetid.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: mknetid.8,v 1.13 2007/05/31 19:20:31 jmc Exp $
+.\" $OpenBSD: mknetid.8,v 1.14 2009/10/16 09:46:40 sobrado Exp $
.\"
.\" Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
.\" All rights reserved.
@@ -24,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd $Mdocdate: May 31 2007 $
+.Dd $Mdocdate: October 16 2009 $
.Dt MKNETID 8
.Os
.Sh NAME
@@ -33,12 +33,12 @@
.Sh SYNOPSIS
.Nm mknetid
.Bk -words
-.Op Fl d Ar domain
.Op Fl q
-.Op Fl p Ar passwdfile
+.Op Fl d Ar domain
.Op Fl g Ar groupfile
.Op Fl h Ar hostfile
.Op Fl m Ar netidfile
+.Op Fl p Ar passwdfile
.Ek
.Sh DESCRIPTION
.Nm
@@ -57,15 +57,6 @@ The options are as follows:
.Bl -tag -width Ds
.It Fl d Ar domain
Which yp-domain if not default yp-domain.
-.It Fl q
-Keep quiet about multiple occurrences of a UID.
-Ignore all but the first.
-.It Fl p Ar passwdfile
-Alternate
-.Xr passwd 5
-file.
-Default is
-.Pa /etc/passwd .
.It Fl g Ar groupfile
Alternate
.Xr group 5
@@ -85,6 +76,15 @@ file.
Default is
.Pa /etc/netid .
file.
+.It Fl p Ar passwdfile
+Alternate
+.Xr passwd 5
+file.
+Default is
+.Pa /etc/passwd .
+.It Fl q
+Keep quiet about multiple occurrences of a UID.
+Ignore all but the first.
.El
.Sh FILES
.Bl -tag -width /etc/passwd -compact
diff --git a/usr.sbin/ypserv/mknetid/mknetid.c b/usr.sbin/ypserv/mknetid/mknetid.c
index 82c0df08351..0732fa63247 100644
--- a/usr.sbin/ypserv/mknetid/mknetid.c
+++ b/usr.sbin/ypserv/mknetid/mknetid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mknetid.c,v 1.15 2008/02/23 22:21:17 deraadt Exp $ */
+/* $OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $ */
/*
* Copyright (c) 1996 Mats O Jansson <moj@stacken.kth.se>
@@ -27,7 +27,7 @@
*/
#ifndef lint
-static const char rcsid[] = "$OpenBSD: mknetid.c,v 1.15 2008/02/23 22:21:17 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: mknetid.c,v 1.16 2009/10/16 09:46:40 sobrado Exp $";
#endif
#include <sys/param.h>
@@ -493,9 +493,9 @@ print_netid(FILE *mfile, char *fname)
static void
usage(void)
{
- fprintf(stderr,
- "usage: mknetid [-d domain] [-q] [-p passwdfile] [-g groupfile]\n"
- " [-h hostfile] [-m netidfile]\n");
+ fprintf(stderr, "usage: mknetid [-q] [-d domain] [-g groupfile] "
+ "[-h hostfile] [-m netidfile]\n"
+ " [-p passwdfile]\n");
exit(1);
}