Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/nsd/dist remove accidental commit debris.



details:   https://anonhg.NetBSD.org/src/rev/d1d822c491bd
branches:  trunk
changeset: 433917:d1d822c491bd
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 12 18:02:59 2018 +0000

description:
remove accidental commit debris.

diffstat:

 external/bsd/nsd/dist/o |  238 ------------------------------------------------
 1 files changed, 0 insertions(+), 238 deletions(-)

diffs (242 lines):

diff -r 96e17267f56f -r d1d822c491bd external/bsd/nsd/dist/o
--- a/external/bsd/nsd/dist/o   Fri Oct 12 09:43:59 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
---- config.h   2018-09-03 05:42:59.303250911 -0400
-+++ ../include/config.h        2018-02-17 12:04:30.889465872 -0500
-@@ -5,20 +5,20 @@
- #define BIND8_STATS /**/
- 
- /* NSD default chroot directory */
--/* #undef CHROOTDIR */
-+#define CHROOTDIR "/var/chroot/nsd"
- 
- /* NSD config dir */
--#define CONFIGDIR "/etc/nsd"
-+#define CONFIGDIR CHROOTDIR "/etc/nsd"
- 
- /* Pathname to the NSD configuration file */
--#define CONFIGFILE "/etc/nsd/nsd.conf"
-+#define CONFIGFILE CHROOTDIR "/etc/nsd/nsd.conf"
- 
- /* Define this if on macOSX10.4-darwin8 and setreuid and setregid do not work
-    */
- /* #undef DARWIN_BROKEN_SETREUID */
- 
- /* Pathname to the NSD database */
--#define DBFILE "/var/db/nsd/nsd.db"
-+#define DBFILE CHROOTDIR "/var/db/nsd/nsd.db"
- 
- /* Define to the default maximum message length with EDNS. */
- #define EDNS_MAX_MESSAGE_LEN 4096
-@@ -26,9 +26,6 @@
- /* 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
- 
-@@ -72,13 +69,13 @@
- #define HAVE_DUP2 1
- 
- /* Define to 1 if you have the <endian.h> header file. */
--#define HAVE_ENDIAN_H 1
-+/* #undef HAVE_ENDIAN_H */
- 
- /* Define to 1 if you have the `endpwent' function. */
- #define HAVE_ENDPWENT 1
- 
- /* Define to 1 if you have the `ERR_load_crypto_strings' function. */
--/* #undef HAVE_ERR_LOAD_CRYPTO_STRINGS */
-+#define HAVE_ERR_LOAD_CRYPTO_STRINGS 1
- 
- /* Define to 1 if you have the `event_base_free' function. */
- #define HAVE_EVENT_BASE_FREE 1
-@@ -96,7 +93,7 @@
- #define HAVE_EVENT_H 1
- 
- /* Define to 1 if you have the `EVP_cleanup' function. */
--/* #undef HAVE_EVP_CLEANUP */
-+#define HAVE_EVP_CLEANUP 1
- 
- /* Define to 1 if you have the `ev_default_loop' function. */
- /* #undef HAVE_EV_DEFAULT_LOOP */
-@@ -141,10 +138,10 @@
- #define HAVE_GRP_H 1
- 
- /* Define to 1 if you have the `HMAC_CTX_new' function. */
--#define HAVE_HMAC_CTX_NEW 1
-+#define HAVE_HMAC_CTX_NEW     1
- 
- /* Define to 1 if you have the `HMAC_CTX_reset' function. */
--#define HAVE_HMAC_CTX_RESET 1
-+#define HAVE_HMAC_CTX_RESET   1
- 
- /* Define to 1 if you have the `inet_aton' function. */
- #define HAVE_INET_ATON 1
-@@ -205,10 +202,12 @@
- #define HAVE_OPENSSL_ERR_H 1
- 
- /* Define to 1 if you have the `OPENSSL_init_crypto' function. */
--#define HAVE_OPENSSL_INIT_CRYPTO 1
-+/* #undef HAVE_OPENSSL_INIT_CRYPTO */
- 
- /* Define to 1 if you have the `OPENSSL_init_ssl' function. */
--#define HAVE_OPENSSL_INIT_SSL 1
-+/* #undef HAVE_OPENSSL_INIT_SSL */
-+
-+ /* Define to 1 if you have the <openssl/rand.h> header file. */
- 
- /* Define to 1 if you have the <openssl/rand.h> header file. */
- #define HAVE_OPENSSL_RAND_H 1
-@@ -232,10 +231,10 @@
- #define HAVE_REALLOCARRAY 1
- 
- /* Define if recvmmsg is implemented */
--/* #undef HAVE_RECVMMSG */
-+#define HAVE_RECVMMSG 1
- 
- /* Define if sendmmsg is implemented */
--/* #undef HAVE_SENDMMSG */
-+#define HAVE_SENDMMSG 1
- 
- /* Define to 1 if you have the `setregid' function. */
- #define HAVE_SETREGID 1
-@@ -250,7 +249,7 @@
- #define HAVE_SETREUID 1
- 
- /* Define to 1 if you have the `setusercontext' function. */
--/* #undef HAVE_SETUSERCONTEXT */
-+#define HAVE_SETUSERCONTEXT 1
- 
- /* Define to 1 if you have the `sigaction' function. */
- #define HAVE_SIGACTION 1
-@@ -318,9 +317,6 @@
- /* 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
- 
-@@ -354,9 +350,6 @@
- /* 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
- 
-@@ -391,10 +384,12 @@
- #define HAVE_WRITEV 1
- 
- /* Define to the default nsd identity. */
--#define IDENTITY "unidentified server"
-+#define IDENTITY "NetBSD server"
- 
-+#ifdef notdef
- /* Define this to enable IPv6 support. */
- #define INET6 /**/
-+#endif
- 
- /* If flex defines yy_current_buffer as a macro */
- /* #undef LEX_DEFINES_YY_CURRENT_BUFFER */
-@@ -402,9 +397,6 @@
- /* 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 */
- 
-@@ -428,7 +420,7 @@
- #define NSD_CONTROL_VERSION 1
- 
- /* Pathname to start nsd from nsd-control */
--#define NSD_START_PATH "/usr/local/sbin/nsd"
-+#define NSD_START_PATH "/usr/sbin/nsd"
- 
- /* Define this to enable NSEC3 support. */
- #define NSEC3 /**/
-@@ -440,7 +432,7 @@
- #define PACKAGE_NAME "NSD"
- 
- /* Define to the full name and version of this package. */
--#define PACKAGE_STRING "NSD 4.1.24"
-+#define PACKAGE_STRING "NSD 4.1.19"
- 
- /* Define to the one symbol short name of this package. */
- #define PACKAGE_TARNAME "nsd"
-@@ -449,16 +441,16 @@
- #define PACKAGE_URL ""
- 
- /* Define to the version of this package. */
--#define PACKAGE_VERSION "4.1.24"
-+#define PACKAGE_VERSION "4.1.19"
- 
- /* Define this to use packed structure alignment. */
- /* #undef PACKED_STRUCTS */
- 
- /* Pathname to the NSD pidfile */
--#define PIDFILE "/var/run/nsd.pid"
-+#define PIDFILE CHROOTDIR "/var/run/nsd.pid"
- 
- /* Define this to enable rate limiting. */
--/* #undef RATELIMIT */
-+#define RATELIMIT 1
- 
- /* Define this to set ratelimit to off by default. */
- /* #undef RATELIMIT_DEFAULT_OFF */
-@@ -503,7 +495,7 @@
- #define UDP_PORT "53"
- 
- /* the user name to drop privileges to */
--#define USER "nsd"
-+#define USER "_nsd"
- 
- /* Define if you want to use internal select based events */
- /* #undef USE_MINI_EVENT */
-@@ -543,20 +535,20 @@
- #define VERSION PACKAGE_STRING
- 
- /* Pathname to the NSD xfrd zone timer state file. */
--#define XFRDFILE "/var/db/nsd/xfrd.state"
-+#define XFRDFILE CHROOTDIR "/var/db/nsd/xfrd.state"
- 
- /* Pathname to where the NSD transfer dir is created. */
--#define XFRDIR "/tmp"
-+#define XFRDIR CHROOTDIR "/var/tmp"
- 
- /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
-    `char[]'. */
- #define YYTEXT_POINTER 1
- 
- /* Pathname to the NSD zone list file. */
--#define ZONELISTFILE "/var/db/nsd/zone.list"
-+#define ZONELISTFILE CHROOTDIR "/var/db/nsd/zone.list"
- 
- /* NSD default location for zone files. Empty string or NULL to disable. */
--#define ZONESDIR "/etc/nsd"
-+#define ZONESDIR CHROOTDIR "/etc/nsd"
- 
- /* Enable large inode numbers on Mac OS X 10.5.  */
- #ifndef _DARWIN_USE_64_BIT_INODE
-@@ -849,8 +841,7 @@
- #endif /* !CONFIG_DEFINES */
- 
- #ifdef PACKED_STRUCTS
--#define ATTR_PACKED __attribute__((packed))
-+#define ATTR_PACKED __attribute__((__packed__))
- #else
- #define ATTR_PACKED
- #endif
--



Home | Main Index | Thread Index | Old Index