Browse Source

tidy up the "modifier" list a little and sync usage();

NB: this utility has only one option, and it's not optional! i haven;t
marked -s as being mandatory, since hopefully someone will make
ntpctl run without arguments do something useful;
OPENBSD_5_5
jmc 11 years ago
parent
commit
1ceaa18b3a
2 changed files with 8 additions and 8 deletions
  1. +6
    -6
      src/usr.sbin/ntpd/ntpctl.8
  2. +2
    -2
      src/usr.sbin/ntpd/ntpd.c

+ 6
- 6
src/usr.sbin/ntpd/ntpctl.8 View File

@ -1,4 +1,4 @@
.\" $OpenBSD: ntpctl.8,v 1.3 2013/10/06 16:52:31 jmc Exp $
.\" $OpenBSD: ntpctl.8,v 1.4 2013/10/16 21:23:59 jmc Exp $
.\" .\"
.\" Copyright (c) 2012 Mike Miller <mmiller@mgm51.com> .\" Copyright (c) 2012 Mike Miller <mmiller@mgm51.com>
.\" .\"
@ -14,7 +14,7 @@
.\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT .\" AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
.\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\" .\"
.Dd $Mdocdate: October 6 2013 $
.Dd $Mdocdate: October 16 2013 $
.Dt NTPCTL 8 .Dt NTPCTL 8
.Os .Os
.Sh NAME .Sh NAME
@ -36,21 +36,21 @@ The options are as follows:
Show the data specified by Show the data specified by
.Ar modifier : .Ar modifier :
.Bl -tag -width "sensorsXXX" .Bl -tag -width "sensorsXXX"
.It Fl s Cm all
.It Cm all
Show all data. Show all data.
.It Fl s Cm peers
.It Cm peers
Show the following information about each peer: weight, trustlevel, Show the following information about each peer: weight, trustlevel,
stratum, number of seconds until the next poll, polling interval stratum, number of seconds until the next poll, polling interval
in seconds, and offset, network delay and network jitter in milliseconds. in seconds, and offset, network delay and network jitter in milliseconds.
When the system clock is synced to a peer, an asterisk When the system clock is synced to a peer, an asterisk
is displayed to the left of the weight column for that peer. is displayed to the left of the weight column for that peer.
.It Fl s Cm sensors
.It Cm sensors
Show the following information about each sensor: weight, sensor "good" Show the following information about each sensor: weight, sensor "good"
status, stratum, and offset and the configured correction in status, stratum, and offset and the configured correction in
milliseconds. milliseconds.
When the system clock is synced to a sensor, an asterisk When the system clock is synced to a sensor, an asterisk
is displayed to the left of the weight column for that sensor. is displayed to the left of the weight column for that sensor.
.It Fl s Cm status
.It Cm status
Show the status of peers and sensors, and whether the system clock is synced. Show the status of peers and sensors, and whether the system clock is synced.
When the system clock is synced, the stratum is displayed. When the system clock is synced, the stratum is displayed.
When the system clock is not synced, the offset of the system clock, When the system clock is not synced, the offset of the system clock,


+ 2
- 2
src/usr.sbin/ntpd/ntpd.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: ntpd.c,v 1.73 2013/10/11 19:33:20 deraadt Exp $ */
/* $OpenBSD: ntpd.c,v 1.74 2013/10/16 21:23:59 jmc Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -81,7 +81,7 @@ usage(void)
extern char *__progname; extern char *__progname;
if (strcmp(__progname, "ntpctl") == 0) if (strcmp(__progname, "ntpctl") == 0)
fprintf(stderr, "usage: ntpctl [-s all|peers|sensors|status]\n");
fprintf(stderr, "usage: ntpctl [-s modifier]\n");
else else
fprintf(stderr, "usage: %s [-dnSsv] [-f file]\n", fprintf(stderr, "usage: %s [-dnSsv] [-f file]\n",
__progname); __progname);


Loading…
Cancel
Save