From: Frank Kardel <kardel@ntp.org>
Date: Sat, 11 Aug 2007 17:30:42 +0000 (+0000)
Subject: ChangeLog:
X-Git-Tag: NTP_4_2_5P69~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=803474b3c54aa19b0175d12f853a2b7d2012dbb9;p=thirdparty%2Fntp.git

ChangeLog:
  document Bug 885
ntp_io.c:
  Bug 885: use emalloc() to get a message at the end of the memory
cmd_args.c:
  Bug 885: unsigned types cannot be less than 0
  	 default_ai_family is a short
ntp_config.c:
  Bug 885: lose trailing , from enum list

bk: 46bdf242qHYJ8PcLVjFeXX1z4oL28A
---

diff --git a/ChangeLog b/ChangeLog
index d319c155b..9d8451d93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+* [Bug 885] use emalloc() to get a message at the end of the memory
+            unsigned types cannot be less than 0
+            default_ai_family is a short
+            lose trailing , from enum list
 * [Bug 884] don't access recv buffers after having them passed to the free list.
 * [Bug 882] allow loopback interfaces to share addresses with other interfaces.
 
diff --git a/ntpd/cmd_args.c b/ntpd/cmd_args.c
index c71167ec1..91f376f77 100644
--- a/ntpd/cmd_args.c
+++ b/ntpd/cmd_args.c
@@ -23,7 +23,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;
@@ -126,7 +126,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);
diff --git a/ntpd/ntp_config.c b/ntpd/ntp_config.c
index d4ba6b42a..05af3ffc2 100644
--- a/ntpd/ntp_config.c
+++ b/ntpd/ntp_config.c
@@ -406,7 +406,7 @@ static	int matchkey P((char *, struct keyword *, int));
 enum gnn_type {
 	t_UNK,		/* Unknown */
 	t_REF,		/* Refclock */
-	t_MSK,		/* Network Mask */
+	t_MSK		/* Network Mask */
 	};
 static	int getnetnum P((const char *, struct sockaddr_storage *, int,
 			 enum gnn_type));
diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 395f4780d..ae0208ae1 100644
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -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;