Module Name: src
Committed By: wiz
Date: Mon Nov 5 09:22:30 UTC 2018
Modified Files:
src/usr.sbin/syslogd: syslogd.8 syslogd.c
Log Message:
Sort options.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/syslogd/syslogd.8
cvs rdiff -u -r1.128 -r1.129 src/usr.sbin/syslogd/syslogd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/syslogd/syslogd.8
diff -u src/usr.sbin/syslogd/syslogd.8:1.57 src/usr.sbin/syslogd/syslogd.8:1.58
--- src/usr.sbin/syslogd/syslogd.8:1.57 Sun Nov 4 20:45:21 2018
+++ src/usr.sbin/syslogd/syslogd.8 Mon Nov 5 09:22:30 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: syslogd.8,v 1.57 2018/11/04 20:45:21 roy Exp $
+.\" $NetBSD: syslogd.8,v 1.58 2018/11/05 09:22:30 wiz Exp $
.\"
.\" Copyright (c) 1983, 1986, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -38,8 +38,8 @@
.Sh SYNOPSIS
.Nm
.Op Fl dnrSsTUvX
-.Op Fl b Ar bind_address
.Op Fl B Ar buffer_length
+.Op Fl b Ar bind_address
.Op Fl f Ar config_file
.Op Fl g Ar group
.Op Fl m Ar mark_interval
@@ -57,10 +57,6 @@ reads and logs messages to the system co
machines and/or users as specified by its configuration file.
The options are as follows:
.Bl -tag -width 15n
-.It Fl b Ar bind_address
-Specify one specific IP address or hostname to bind to.
-If a hostname is specified, the IPv4 or IPv6 address
-which corresponds to it is used.
.It Fl B Ar buffer_length
Sets the receiving buffer length.
The default is 16384 bytes.
@@ -68,6 +64,10 @@ If syslogd reports buffer overflow, this
If you don't care about it being reported, see the
.Fl X
option.
+.It Fl b Ar bind_address
+Specify one specific IP address or hostname to bind to.
+If a hostname is specified, the IPv4 or IPv6 address
+which corresponds to it is used.
.It Fl d
Enable debugging to the standard output,
and do not disassociate from the controlling terminal.
@@ -126,20 +126,16 @@ which
runs is subject to attack over the network and it is desired
that the machine be protected from attempts to remotely fill logs
and similar attacks.
-.It Fl t Ar chroot_dir
-.Xr chroot 2
-to
-.Ar chroot_dir
-after the sockets and log files have been opened.
.It Fl T
Always use the local time and date for messages received from the
network, instead of the timestamp field supplied in the message
by the remote host.
This is useful if some of the originating hosts can't keep time
properly or are unable to generate a correct timestamp.
-.It Fl u Ar user
-Set UID to
-.Ar user
+.It Fl t Ar chroot_dir
+.Xr chroot 2
+to
+.Ar chroot_dir
after the sockets and log files have been opened.
.It Fl U
Unique priority logging.
@@ -151,6 +147,10 @@ This option changes the default priority
.Sq >=
to
.Sq = .
+.It Fl u Ar user
+Set UID to
+.Ar user
+after the sockets and log files have been opened.
.It Fl v
Verbose logging.
If specified once, the numeric facility and priority are logged with
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.128 src/usr.sbin/syslogd/syslogd.c:1.129
--- src/usr.sbin/syslogd/syslogd.c:1.128 Mon Nov 5 08:34:20 2018
+++ src/usr.sbin/syslogd/syslogd.c Mon Nov 5 09:22:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $ */
+/* $NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.128 2018/11/05 08:34:20 martin Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.129 2018/11/05 09:22:30 wiz Exp $");
#endif
#endif /* not lint */
@@ -686,7 +686,7 @@ usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-dnrSsTUvX] [-b bind_address] [-B buffer_length]\n"
+ "usage: %s [-dnrSsTUvX] [-B buffer_length] [-b bind_address]\n"
"\t[-f config_file] [-g group]\n"
"\t[-m mark_interval] [-P file_list] [-p log_socket\n"
"\t[-p log_socket2 ...]] [-t chroot_dir] [-u user]\n",
