If you delete this, people's ntpd will fail to start. getopt will fail to match, drop into usage, and fail.
It is way too early to cause that problem. Couple more years I think. Klemens Nanni <[email protected]> wrote: > On Mon, Jul 12, 2021 at 09:08:59PM +0000, Klemens Nanni wrote: > > deraadt neutered these options in november 2019, I'd say it's time to > > remove them so the next release won't have it. > > > > Feedback? Objections? OK? > > Ping. > ntpd(8) obviously doesn't document them any longer. > > Index: ntpd.c > =================================================================== > RCS file: /cvs/src/usr.sbin/ntpd/ntpd.c,v > retrieving revision 1.132 > diff -u -p -r1.132 ntpd.c > --- ntpd.c 16 Jul 2021 14:36:09 -0000 1.132 > +++ ntpd.c 24 Jul 2021 19:45:34 -0000 > @@ -140,7 +140,6 @@ main(int argc, char *argv[]) > char **argv0 = argv; > char *pname = NULL; > time_t settime_deadline; > - int sopt = 0; > > if (strcmp(__progname, "ntpctl") == 0) { > ctl_main(argc, argv); > @@ -151,7 +150,7 @@ main(int argc, char *argv[]) > > memset(&lconf, 0, sizeof(lconf)); > > - while ((ch = getopt(argc, argv, "df:nP:sSv")) != -1) { > + while ((ch = getopt(argc, argv, "df:nP:v")) != -1) { > switch (ch) { > case 'd': > lconf.debug = 1; > @@ -166,10 +165,6 @@ main(int argc, char *argv[]) > case 'P': > pname = optarg; > break; > - case 's': > - case 'S': > - sopt = ch; > - break; > case 'v': > lconf.verbose++; > break; > @@ -185,12 +180,6 @@ main(int argc, char *argv[]) > logdest |= LOG_TO_SYSLOG; > > log_init(logdest, lconf.verbose, LOG_DAEMON); > - > - if (sopt) { > - log_warnx("-%c option no longer works and will be removed > soon.", > - sopt); > - log_warnx("Please reconfigure to use constraints or trusted > servers."); > - } > > argc -= optind; > argv += optind; >
