OpenNTPD daemon with OpenSSL implementation & flexible configurability
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
1.0 KiB

  1. From: Pekka Helenius <fincer89@hotmail.com>
  2. Date: Mon, 15 Feb 2021 22:20:14 +0300
  3. Subject: Re-enable initial time synchronization setting (-s and -S parameters).
  4. --- a/src/ntpd.c 2021-01-20 23:00:53.946365898 +0200
  5. +++ b/src/ntpd.c 2021-02-15 22:18:58.517431728 +0200
  6. @@ -167,7 +167,6 @@ main(int argc, char *argv[])
  7. char **argv0 = argv;
  8. char *pname = NULL;
  9. time_t settime_deadline = 0;
  10. - int sopt = 0;
  11. __progname = get_progname(argv[0]);
  12. @@ -213,8 +212,10 @@ main(int argc, char *argv[])
  13. lconf.pid_file = optarg;
  14. break;
  15. case 's':
  16. + lconf.settime = 1;
  17. + break;
  18. case 'S':
  19. - sopt = ch;
  20. + lconf.settime = 0;
  21. break;
  22. case 'v':
  23. lconf.verbose++;
  24. @@ -232,12 +233,6 @@ main(int argc, char *argv[])
  25. log_init(logdest, lconf.verbose, LOG_DAEMON);
  26. - if (sopt) {
  27. - log_warnx("-%c option no longer works and will be removed soon.",
  28. - sopt);
  29. - log_warnx("Please reconfigure to use constraints or trusted servers.");
  30. - }
  31. -
  32. argc -= optind;
  33. argv += optind;
  34. if (argc > 0)