[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at deacon.udel.edu
Sun Apr 17 20:13:01 UTC 2011


#### ChangeSet ####
2011-04-17 20:08:44+00:00, davehart at shiny.ad.hartbrothers.com
  Automerge of ChangeLog got it wrong.

==== ChangeLog ====
2011-04-17 20:08:43+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  Automerge of ChangeLog got it wrong.

--- 1.855/ChangeLog	2011-04-17 16:06:17 -04:00
+++ 1.856/ChangeLog	2011-04-17 16:08:43 -04:00
@@ -1,6 +1,6 @@
+* Fix leak in refclock_datum.c start failure path.
 (4.2.7p154) 2011/04/17 Released by Harlan Stenn <stenn at ntp.org>
 * [Bug 1887] DNS fails on 4.2.7p153 using threads.
-* Fix leak in refclock_datum.c start failure path.
 (4.2.7p153) 2011/04/16 Released by Harlan Stenn <stenn at ntp.org>
 * A few more Coverity Scan cleanups.
 (4.2.7p152) 2011/04/15 Released by Harlan Stenn <stenn at ntp.org>

#### ChangeSet ####
2011-04-17 08:22:57+00:00, davehart at shiny.ad.hartbrothers.com
  Correct includes in lib/isc for strlcpy(), strlcat() prototypes.

==== lib/isc/log.c ====
2011-04-17 08:22:56+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  Correct includes in lib/isc for strlcpy(), strlcat() prototypes.

--- 1.4/lib/isc/log.c	2011-04-15 15:53:03 -04:00
+++ 1.5/lib/isc/log.c	2011-04-17 04:22:56 -04:00
@@ -41,7 +41,7 @@
 #include <isc/string.h>
 #include <isc/time.h>
 #include <isc/util.h>
-#include "l_stdlib.h"		/* NTP change for strlcpy, strlcat */
+#include "ntp_stdlib.h"		/* NTP change for strlcpy, strlcat */
 
 #define LCTX_MAGIC		ISC_MAGIC('L', 'c', 't', 'x')
 #define VALID_CONTEXT(lctx)	ISC_MAGIC_VALID(lctx, LCTX_MAGIC)

==== lib/isc/netaddr.c ====
2011-04-17 08:22:56+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  Correct includes in lib/isc for strlcpy(), strlcat() prototypes.

--- 1.10/lib/isc/netaddr.c	2011-04-15 15:53:03 -04:00
+++ 1.11/lib/isc/netaddr.c	2011-04-17 04:22:56 -04:00
@@ -31,7 +31,7 @@
 #include <isc/sockaddr.h>
 #include <isc/string.h>
 #include <isc/util.h>
-#include "l_stdlib.h"		/* NTP change for strlcpy, strlcat */
+#include "ntp_stdlib.h"		/* NTP change for strlcpy, strlcat */
 
 isc_boolean_t
 isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) {

==== lib/isc/unix/dir.c ====
2011-04-17 08:22:56+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  Correct includes in lib/isc for strlcpy(), strlcat() prototypes.

--- 1.2/lib/isc/unix/dir.c	2011-04-15 15:53:03 -04:00
+++ 1.3/lib/isc/unix/dir.c	2011-04-17 04:22:56 -04:00
@@ -35,7 +35,7 @@
 #include <isc/util.h>
 
 #include "errno2result.h"
-#include "l_stdlib.h"		/* NTP change for strlcpy, strlcat */
+#include "ntp_stdlib.h"		/* NTP change for strlcpy, strlcat */
 
 #define ISC_DIR_MAGIC		ISC_MAGIC('D', 'I', 'R', '*')
 #define VALID_DIR(dir)		ISC_MAGIC_VALID(dir, ISC_DIR_MAGIC)

==== lib/isc/unix/file.c ====
2011-04-17 08:22:56+00:00, davehart at shiny.ad.hartbrothers.com +1 -1
  Correct includes in lib/isc for strlcpy(), strlcat() prototypes.

--- 1.2/lib/isc/unix/file.c	2011-04-15 15:53:03 -04:00
+++ 1.3/lib/isc/unix/file.c	2011-04-17 04:22:56 -04:00
@@ -74,7 +74,7 @@
 #include <isc/util.h>
 
 #include "errno2result.h"
-#include "l_stdlib.h"		/* NTP change for strlcpy, strlcat */
+#include "ntp_stdlib.h"		/* NTP change for strlcpy, strlcat */
 
 /*
  * XXXDCL As the API for accessing file statistics undoubtedly gets expanded,

#### ChangeSet ####
2011-04-17 08:10:39+00:00, davehart at shiny.ad.hartbrothers.com
  Fix leak in refclock_datum.c start failure path.

==== ChangeLog ====
2011-04-17 08:10:36+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  Fix leak in refclock_datum.c start failure path.

--- 1.853/ChangeLog	2011-04-16 14:14:12 -04:00
+++ 1.854/ChangeLog	2011-04-17 04:10:36 -04:00
@@ -1,4 +1,5 @@
 * [Bug 1887] DNS fails on 4.2.7p153 using threads.
+* Fix leak in refclock_datum.c start failure path.
 (4.2.7p153) 2011/04/16 Released by Harlan Stenn <stenn at ntp.org>
 * A few more Coverity Scan cleanups.
 (4.2.7p152) 2011/04/15 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/refclock_datum.c ====
2011-04-17 08:10:37+00:00, davehart at shiny.ad.hartbrothers.com +1 -0
  Fix leak in refclock_datum.c start failure path.

--- 1.18/ntpd/refclock_datum.c	2011-04-15 15:53:03 -04:00
+++ 1.19/ntpd/refclock_datum.c	2011-04-17 04:10:37 -04:00
@@ -278,6 +278,7 @@ datum_pts_start(
 	if (rc < 0) {
 		msyslog(LOG_ERR, "Datum_PTS: tcsetattr(\"%s\") failed: %m", DATUM_DEV);
 		close(datum_pts->PTS_fd);
+		free(datum_pts);
 		return 0;
 	}
 


More information about the bk-ntp-dev-send mailing list