Virgin import of ntpd 4.2.6p5.

When the series of commits is complete, things like
https://cert.litnet.lt/en/docs/ntp-distributed-reflection-dos-attacks
should be fixed.

PR:		bin/148836 (except that we import a newer version)
Asked by:	Too many
MFC after:	2 weeks

1 files changed, 16 insertions, 14 deletions

diff --git a/libntp/strdup.c b/libntp/strdup.c
index 2e26ba7..f7565a2 100644
--- a/libntp/strdup.c
+++ b/libntp/strdup.c
@@ -1,8 +1,9 @@
-#include "ntp_malloc.h"
+#include <config.h>
 
-#if !HAVE_STRDUP
+#include <string.h>
+#include "ntp_malloc.h"
 
-#define NULL 0
+#ifndef HAVE_STRDUP
 
 char *strdup(const char *s);
 
@@ -11,18 +12,19 @@ strdup(
 	const char *s
 	)
 {
-        char *cp;
+	size_t	octets;
+	char *	cp;
+
+	if (s) {
+		octets = 1 + strlen(s);
+		cp = malloc(octets);
+		if (NULL != cp)
+			memcpy(cp, s, octets);
+	else
+		cp = NULL;
 
-        if (s) {
-                cp = (char *) malloc((unsigned) (strlen(s)+1));
-                if (cp) {
-                        (void) strcpy(cp, s);
-		}
-        } else {
-                cp = (char *) NULL;
-	}
-        return(cp);
+	return(cp);
 }
 #else
-int strdup_bs;
+int strdup_c_nonempty_compilation_unit;
 #endif