Module Name: src
Committed By: christos
Date: Mon Sep 3 11:40:09 UTC 2018
Modified Files:
src/external/bsd/nsd/include: config.h
Removed Files:
src/external/bsd/nsd/dist: configlexer.c configparser.c configparser.h
zlexer.c zparser.c zparser.h
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/nsd/dist/configlexer.c \
src/external/bsd/nsd/dist/configparser.c \
src/external/bsd/nsd/dist/configparser.h \
src/external/bsd/nsd/dist/zlexer.c src/external/bsd/nsd/dist/zparser.c \
src/external/bsd/nsd/dist/zparser.h
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/include/config.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nsd/include/config.h
diff -u src/external/bsd/nsd/include/config.h:1.2 src/external/bsd/nsd/include/config.h:1.3
--- src/external/bsd/nsd/include/config.h:1.2 Fri Feb 9 12:13:27 2018
+++ src/external/bsd/nsd/include/config.h Mon Sep 3 07:40:09 2018
@@ -26,6 +26,9 @@
/* Define to the default facility for syslog. */
#define FACILITY LOG_DAEMON
+/* Define to 1 if you have the `accept4' function. */
+#define HAVE_ACCEPT4 1
+
/* Define to 1 if you have the `alarm' function. */
#define HAVE_ALARM 1
@@ -69,7 +72,7 @@
#define HAVE_DUP2 1
/* Define to 1 if you have the <endian.h> header file. */
-/* #undef HAVE_ENDIAN_H */
+#define HAVE_ENDIAN_H 1
/* Define to 1 if you have the `endpwent' function. */
#define HAVE_ENDPWENT 1
@@ -317,6 +320,9 @@
/* Define to 1 if you have the `strtol' function. */
#define HAVE_STRTOL 1
+/* Define to 1 if `sun_len' is a member of `struct sockaddr_un'. */
+#define HAVE_STRUCT_SOCKADDR_UN_SUN_LEN 1
+
/* Define to 1 if `st_mtimensec' is a member of `struct stat'. */
#define HAVE_STRUCT_STAT_ST_MTIMENSEC 1
@@ -350,6 +356,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
+/* Define to 1 if you have the <sys/un.h> header file. */
+#define HAVE_SYS_UN_H 1
+
/* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
#define HAVE_SYS_WAIT_H 1
@@ -397,6 +406,9 @@
/* Define to the maximum message length to pass to syslog. */
#define MAXSYSLOGMSGLEN 512
+/* Define this to cleanup memory at exit (eg. for valgrind, etc.) */
+/* #undef MEMCLEAN */
+
/* Define if memcmp() does not compare unsigned bytes */
/* #undef MEMCMP_IS_BROKEN */
@@ -432,7 +444,7 @@
#define PACKAGE_NAME "NSD"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "NSD 4.1.19"
+#define PACKAGE_STRING "NSD 4.1.24"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "nsd"
@@ -441,7 +453,7 @@
#define PACKAGE_URL ""
/* Define to the version of this package. */
-#define PACKAGE_VERSION "4.1.19"
+#define PACKAGE_VERSION "4.1.24"
/* Define this to use packed structure alignment. */
/* #undef PACKED_STRUCTS */
