Deleted Added
full compact
89a90,99
> fprintf(stderr,
> "command line -i option (jaildir) is not supported by this binary"
> # ifndef SYS_WINNT
> ",\n" "can not drop root privileges. See configure options\n"
> "--enable-clockctl and --enable-linuxcaps.\n");
> # else
> ".\n");
> # endif
> msyslog(LOG_ERR,
> "command line -i option (jaildir) is not supported by this binary.");
121,122c131,132
< int ct = STACKCT_OPT( TRUSTEDKEY );
< const char** pp = STACKLST_OPT( TRUSTEDKEY );
---
> int ct = STACKCT_OPT( TRUSTEDKEY );
> const char** pp = STACKLST_OPT( TRUSTEDKEY );
144,152c154,158
< user = malloc(strlen(ntp_optarg) + 1);
< if (user == NULL) {
< errflg++;
< } else {
< (void)strncpy(user, ntp_optarg, strlen(ntp_optarg) + 1);
< group = rindex(user, ':');
< if (group)
< *group++ = '\0'; /* get rid of the ':' */
< }
---
> user = emalloc(strlen(ntp_optarg) + 1);
> (void)strncpy(user, ntp_optarg, strlen(ntp_optarg) + 1);
> group = rindex(user, ':');
> if (group)
> *group++ = '\0'; /* get rid of the ':' */
153a160,169
> fprintf(stderr,
> "command line -u/--user option is not supported by this binary"
> # ifndef SYS_WINNT
> ",\n" "can not drop root privileges. See configure options\n"
> "--enable-clockctl and --enable-linuxcaps.\n");
> # else
> ".\n");
> # endif
> msyslog(LOG_ERR,
> "command line -u/--user option is not supported by this binary.");
159,160c175,176
< int ct = STACKCT_OPT( VAR );
< const char** pp = STACKLST_OPT( VAR );
---
> int ct = STACKCT_OPT( VAR );
> const char** pp = STACKLST_OPT( VAR );
171,172c187,188
< int ct = STACKCT_OPT( DVAR );
< const char** pp = STACKLST_OPT( DVAR );
---
> int ct = STACKCT_OPT( DVAR );
> const char** pp = STACKLST_OPT( DVAR );
191,193c207,212
< msyslog(LOG_ERR,
< "command line interface update interval %ld must be greater or equal to 0",
< val);
---
> fprintf(stderr,
> "command line interface update interval %ld must not be negative\n",
> val);
> msyslog(LOG_ERR,
> "command line interface update interval %ld must not be negative",
> val);
228c247,248
< printf("argc is <%d>\n", argc);
---
> if (argc)
> fprintf(stderr, "argc after processing is <%d>\n", argc);