[Git][NTPsec/ntpsec][master] 2 commits: Fix errors in ntpq argument handling and docs.

[Ian Bruene]

Ian Bruene pushed to branch master at NTPsec / ntpsec


Commits:
3ef5360e by Ian Bruene at 2017-06-15T11:07:15-05:00
Fix errors in ntpq argument handling and docs.

- - - - -
08fa3e26 by Ian Bruene at 2017-06-15T11:15:55-05:00
Updated ntpq options description paragraph to reflect modern ntpq.

- - - - -


2 changed files:

- docs/includes/ntpq-body.txt
- ntpclients/ntpq


Changes:

=====================================
docs/includes/ntpq-body.txt
=====================================
--- a/docs/includes/ntpq-body.txt
+++ b/docs/includes/ntpq-body.txt
@@ -49,10 +49,10 @@ For a simpler near-real-time monitor, see {ntpmonman}.
 
 == Options ==
 
-Command line options are described following. Specifying a command line
-option other than +-i+ or +-n+ will cause the specified query (queries)
-to be sent to the indicated host(s) immediately. Otherwise, +ntpq+ will
-attempt to read interactive format commands from the standard input.
+Command line options are described following. Specifying the command line
+options +-c+ or +-p+ will cause the specified query (queries) to be sent
+to the indicated host(s) immediately. Otherwise, +ntpq+ will attempt to
+read interactive format commands from the standard input.
 
 +-4+, +--ipv4+::
   Force DNS resolution of following host names on the command line to
@@ -60,7 +60,7 @@ attempt to read interactive format commands from the standard input.
 +-6+, +--ipv6+::
   Force DNS resolution of following host names on the command line to
   the IPv6 namespace.
-+-a+ num, +--authentication+::
++-a+ num, +--authentication+=num::
   Enable authentication with the numbered key.
 +-c+ cmd, +--command+=cmd::
   The following argument is interpreted as an interactive format command
@@ -80,7 +80,7 @@ attempt to read interactive format commands from the standard input.
 +-p+, +--peers+::
   Print a list of the peers known to the server as well as a summary of
   their state. This is equivalent to the +peers+ interactive command.
-+-k+ filename, +--keyfile+::
++-k+ filename, +--keyfile+=filename::
   Specify a keyfile. ntpq will look in this file for the key specified
   with -a.
 +-V+, +--version+::


=====================================
ntpclients/ntpq
=====================================
--- a/ntpclients/ntpq
+++ b/ntpclients/ntpq
@@ -1601,7 +1601,7 @@ if __name__ == '__main__':
              "command=", "debug", "set-debug-level=",
              "help", "keyfile", "numeric", "peers",
              "version", "wide", "width=", "units",
-             "log-to-file"])
+             "log-to-file="])
     except getopt.GetoptError as e:
         sys.stderr.write("%s\n" % e)
         sys.stderr.write(usage)



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/83a48e8bca225417c606b316195fb71e18c34e5a...08fa3e26e8c6d4a1dd9256f356c941ce62d78de7

---
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/83a48e8bca225417c606b316195fb71e18c34e5a...08fa3e26e8c6d4a1dd9256f356c941ce62d78de7
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170615/60a4710f/attachment.html>