[Git][NTPsec/ntpsec][master] 4 commits: Remove ntpd flag inline help related to broadcast client

[Matt Selsky]

Matt Selsky pushed to branch master at NTPsec / ntpsec


Commits:
ec20a609 by Matt Selsky at 2017-02-02T21:55:15-05:00
Remove ntpd flag inline help related to broadcast client

- - - - -
e1a08eaf by Matt Selsky at 2017-02-02T21:55:15-05:00
Add ntpd's --pidfile and --priority flags.

- - - - -
169474f0 by Matt Selsky at 2017-02-02T21:55:15-05:00
Remove ntpd flags related to TESTFRAME

- - - - -
dce1da06 by Matt Selsky at 2017-02-02T21:55:15-05:00
ntpd will exit after the first -V flag.

- - - - -


2 changed files:

- docs/includes/ntpd-body.txt
- ntpd/ntpd.c


Changes:

=====================================
docs/includes/ntpd-body.txt
=====================================
--- a/docs/includes/ntpd-body.txt
+++ b/docs/includes/ntpd-body.txt
@@ -263,8 +263,7 @@ discipline is disabled with this option.
   number of times.
 
 +-V, --version+::
-  Output version of program and exit. -VV gives more detailed version
-  information.
+  Output version of program and exit.
 
 Any arguments given after options are interpreted as server addresses
 or hostnames, with the _iburst_ option implied. Associations with


=====================================
ntpd/ntpd.c
=====================================
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -125,7 +125,7 @@ static void	library_unexpected_error(const char *, int,
 					 const char *, va_list)
 					ISC_FORMAT_PRINTF(3, 0);
 
-#define ALL_OPTIONS "46c:dD:f:gGhi:I:k:l:LmnNp:PqRs:t:u:UVw:xyYzZ"
+#define ALL_OPTIONS "46c:dD:f:gGhi:I:k:l:LmnNp:PqRs:t:u:UVw:xzZ"
 static const struct option longoptions[] = {
     { "ipv4",		    0, 0, '4' },
     { "ipv6",		    0, 0, '6' },
@@ -143,14 +143,14 @@ static const struct option longoptions[] = {
     { "novirtualips",	    0, 0, 'L' },
     { "nofork",		    0, 0, 'n' },
     { "nice",		    0, 0, 'N' },
+    { "pidfile",	    1, 0, 'p' },
+    { "priority",	    1, 0, 'P' },
     { "quit",		    0, 0, 'q' },
     { "dumpopts",	    0, 0, 'R' },
     { "statsdir",	    1, 0, 's' },
     { "trustedkey",	    1, 0, 't' },
     { "user",		    1, 0, 'u' },
     { "updateinterval",	    1, 0, 'U' },
-    { "capture",	    1, 0, 'y' },
-    { "replay",		    1, 0, 'Y' },
     { "var",		    1, 0, 'z' },
     { "dvar",		    1, 0, 'Z' },
     { "slew",		    0, 0, 'x' },
@@ -167,7 +167,6 @@ static void ntpd_usage(void)
     P("				- prohibits the option 'ipv6'\n");
     P("   -6 no  ipv6           Force IPv6 DNS name resolution\n");
     P("				- prohibits the option 'ipv4'\n");
-    P("   -b no  bcastsync      Allow us to sync to broadcast servers\n");
     P("   -c Str configfile     configuration file name\n");
     P("   -d no  debug-level    Increase output debug message level\n");
     P("				- may appear multiple times\n");
@@ -378,14 +377,6 @@ parse_cmdline_opts(
 	    case 'x':
 		/* defer */
 		break;
-	    case 'y':
-		nofork = true;
-		/* further processed by interception code */
-		break;
-	    case 'Y':
-		nofork = true;
-		/* further processed by interception code */
-		break;
 	    case 'z':
 		/* defer */
 		break;



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/compare/6c16b720500a4ae915d82426b25945adf5f33cd5...dce1da06f5c36d95cc484ee022dceb62e39e8ae9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170203/91dd53a8/attachment.html>