Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pick up upcoming fixes from NTP-Bug 885

This commit is contained in:
kardel 2007-08-18 09:56:13 +00:00
parent 7d3c830b7c
commit a097fb65eb
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/ntp/ntpd/cmd_args.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: cmd_args.c,v 1.4 2007/01/06 19:45:22 kardel Exp $ */
/* $NetBSD: cmd_args.c,v 1.5 2007/08/18 09:56:14 kardel Exp $ */
/*
* cmd_args.c = command-line argument processing
@ -25,7 +25,7 @@
*/
extern char const *progname;
extern const char *specific_interface;
extern int default_ai_family;
extern short default_ai_family;
#ifdef HAVE_NETINFO
extern int check_netinfo;
@ -128,7 +128,7 @@ getCmdOpts(
const char* p = *pp++;
tkey = (int)atol(p);
if (tkey <= 0 || tkey > NTP_MAXKEY) {
if (tkey == 0 || tkey > NTP_MAXKEY) {
msyslog(LOG_ERR,
"command line trusted key %s is invalid",
p);

4
dist/ntp/ntpd/ntp_io.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ntp_io.c,v 1.24 2007/06/24 16:55:14 kardel Exp $ */
/* $NetBSD: ntp_io.c,v 1.25 2007/08/18 09:56:14 kardel Exp $ */
/*
* ntp_io.c - input/output routines for ntpd. The socket-opening code
@ -3591,7 +3591,7 @@ kill_asyncio(int startfd)
*/
static void
add_fd_to_list(SOCKET fd, enum desc_type type) {
vsock_t *lsock = (vsock_t *)malloc(sizeof(vsock_t));
vsock_t *lsock = (vsock_t *)emalloc(sizeof(vsock_t));
lsock->fd = fd;
lsock->type = type;

11
dist/ntp/ntpd/refclock_parse.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: refclock_parse.c,v 1.8 2007/01/06 19:45:23 kardel Exp $ */
/* $NetBSD: refclock_parse.c,v 1.9 2007/08/18 09:56:13 kardel Exp $ */
/*
* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.78 2006/12/22 20:08:27 kardel RELEASE_20061222_A
@ -2634,14 +2634,17 @@ parse_shutdown(
parse->parse_type->cl_end(parse);
}
/*
* cleanup before leaving this world
*/
if (parse->binding)
PARSE_END(parse);
/*
* Tell the I/O module to turn us off. We're history.
*/
io_closeclock(&parse->generic->io);
if (parse->binding)
PARSE_END(parse);
free_varlist(parse->kv);
NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */