diff options
-rw-r--r-- | bind-chroot-ndc.patch | 79 | ||||
-rw-r--r-- | bind-destaddr.patch | 44 | ||||
-rw-r--r-- | bind-fds.patch | 43 | ||||
-rw-r--r-- | bind-host.patch | 10 | ||||
-rw-r--r-- | bind-mkdep.patch | 120 | ||||
-rw-r--r-- | bind-nonlist.patch | 15 | ||||
-rw-r--r-- | bind-pidfile.patch | 15 | ||||
-rw-r--r-- | bind-pmake.patch | 70 | ||||
-rw-r--r-- | bind-probe_ipv6.patch | 12 | ||||
-rw-r--r-- | bind-pselect.patch | 15 | ||||
-rw-r--r-- | bind-res_randomid.patch | 10 | ||||
-rw-r--r-- | bind.spec | 73 | ||||
-rw-r--r-- | bind9-openssl.patch | 30 | ||||
-rw-r--r-- | host_991529+.diff | 206 | ||||
-rw-r--r-- | named-chroot.init | 92 | ||||
-rw-r--r-- | named.conf | 65 | ||||
-rw-r--r-- | nslookup.8 | 534 | ||||
-rw-r--r-- | resolver.5 | 224 | ||||
-rw-r--r-- | utils-holelogd-linux.patch | 39 |
19 files changed, 119 insertions, 1577 deletions
diff --git a/bind-chroot-ndc.patch b/bind-chroot-ndc.patch deleted file mode 100644 index 46eb5bf..0000000 --- a/bind-chroot-ndc.patch +++ /dev/null @@ -1,79 +0,0 @@ ---- bind-8.2.3/src/bin/ndc/pathnames.h Mon Jan 29 19:39:52 2001 -+++ bind-8.2.3-p/src/bin/ndc/pathnames.h Mon Jan 29 19:36:34 2001 -@@ -21,58 +21,62 @@ - - #include <paths.h> - -+#ifndef _CHROOTDIR -+#define _CHROOTDIR "/var/lib/named/chroot" -+#endif -+ - #ifndef _PATH_CONF --#define _PATH_CONF "/etc/named.conf" -+#define _PATH_CONF _CHROOTDIR "/etc/named.conf" - #endif - - #ifndef _PATH_DEBUG --#define _PATH_DEBUG "named.run" -+#define _PATH_DEBUG _CHROOTDIR "/var/tmp/named.run" - #endif - - #ifndef _PATH_DUMPFILE --#define _PATH_DUMPFILE "named_dump.db" -+#define _PATH_DUMPFILE _CHROOTDIR "/var/tmp/named_dump.db" - #endif - - #ifndef _PATH_NAMED --#define _PATH_NAMED "/usr/sbin/named" -+#define _PATH_NAMED _CHROOTDIR "/usr/sbin/named" - #endif - - #ifndef _PATH_PIDFILE --#define _PATH_PIDFILE "/var/run/named.pid" -+#define _PATH_PIDFILE _CHROOTDIR "/var/run/named.pid" - #endif - - #ifndef _PATH_NDCSOCK - #ifdef NEED_SECURE_DIRECTORY --#define _PATH_NDCSOCK "/var/run/ndc.d/ndc" -+#define _PATH_NDCSOCK _CHROOTDIR "/var/run/ndc.d/ndc" - #else --#define _PATH_NDCSOCK "/var/run/ndc" -+#define _PATH_NDCSOCK _CHROOTDIR "/var/run/ndc" - #endif - #endif - - #ifndef _PATH_STATS --#define _PATH_STATS "named.stats" -+#define _PATH_STATS _CHROOTDIR "/var/tmp/named.stats" - #endif - - #ifndef _PATH_MEMSTATS --#define _PATH_MEMSTATS "named.memstats" -+#define _PATH_MEMSTATS _CHROOTDIR "/var/tmp/named.memstats" - #endif - - #ifndef _PATH_TMPXFER --#define _PATH_TMPXFER "xfer.ddt.XXXXXX" -+#define _PATH_TMPXFER _CHROOTDIR "/var/tmp/xfer.ddt.XXXXXX" - #endif - - #ifndef _PATH_XFER --#define _PATH_XFER "/usr/sbin/named-xfer" -+#define _PATH_XFER _CHROOTDIR "/usr/sbin/named-xfer" - #endif - - #ifndef _PATH_XFERTRACE --#define _PATH_XFERTRACE "xfer.trace" -+#define _PATH_XFERTRACE _CHROOTDIR "/var/tmp/xfer.trace" - #endif - - #ifndef _PATH_XFERDDT --#define _PATH_XFERDDT "xfer.ddt" -+#define _PATH_XFERDDT _CHROOTDIR "/var/tmp/xfer.ddt" - #endif - - #ifndef _PATH_DEVNULL --#define _PATH_DEVNULL "/dev/null" -+#define _PATH_DEVNULL _CHROOTDIR "/dev/null" - #endif diff --git a/bind-destaddr.patch b/bind-destaddr.patch new file mode 100644 index 0000000..a32287a --- /dev/null +++ b/bind-destaddr.patch @@ -0,0 +1,44 @@ +diff -ur bind-9.2.4.orig/bin/named/client.c bind-9.2.4/bin/named/client.c +--- bind-9.2.4.orig/bin/named/client.c Fri Jul 23 04:56:59 2004 ++++ bind-9.2.4/bin/named/client.c Sat Dec 18 19:56:38 2004 +@@ -1299,35 +1299,15 @@ + } + + /* +- * Determine the destination address. For TCP/IPv6, we get this from +- * the receiving socket. For UDP/IPv6, we get it from the pktinfo +- * structure (if supported). For IPv4, we have to do with ++ * Determine the destination address. For IPv6, we get this from the ++ * pktinfo structure (if supported). For IPv4, we have to make do with + * the address of the interface where the request was received. + */ + if (client->interface->addr.type.sa.sa_family == AF_INET6) { +- result = ISC_R_FAILURE; +- +- if (TCP_CLIENT(client)) { +- isc_sockaddr_t destsockaddr; +- +- result = isc_socket_getsockname(client->tcpsocket, +- &destsockaddr); +- if (result == ISC_R_SUCCESS) +- isc_netaddr_fromsockaddr(&destaddr, +- &destsockaddr); +- } +- if (result != ISC_R_SUCCESS && +- (client->attributes & NS_CLIENTATTR_PKTINFO) != 0) { ++ if ((client->attributes & NS_CLIENTATTR_PKTINFO) != 0) + isc_netaddr_fromin6(&destaddr, &client->pktinfo.ipi6_addr); +- result = ISC_R_SUCCESS; +- } +- if (result != ISC_R_SUCCESS) { +- UNEXPECTED_ERROR(__FILE__, __LINE__, +- "failed to get request's " +- "destination: %s", +- isc_result_totext(result)); +- goto cleanup; +- } ++ else ++ isc_netaddr_any6(&destaddr); + } else { + isc_netaddr_fromsockaddr(&destaddr, &client->interface->addr); + } diff --git a/bind-fds.patch b/bind-fds.patch deleted file mode 100644 index 54a3404..0000000 --- a/bind-fds.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- bind-8.1.2/src/lib/isc/eventlib.c~ Fri Mar 20 18:26:24 1998 -+++ bind-8.1.2/src/lib/isc/eventlib.c Wed Jan 6 17:44:03 1999 -@@ -290,9 +290,9 @@ - evPrintf(ctx, 4, - "pselect(%d, 0x%lx, 0x%lx, 0x%lx, %d.%09ld)\n", - ctx->fdMax+1, -- (u_long)ctx->rdLast.fds_bits[0], -- (u_long)ctx->wrLast.fds_bits[0], -- (u_long)ctx->exLast.fds_bits[0], -+ __FDS_BITS(&ctx->rdLast)[0], -+ __FDS_BITS(&ctx->wrLast)[0], -+ __FDS_BITS(&ctx->exLast)[0], - tp ? tp->tv_sec : -1, - tp ? tp->tv_nsec : -1); - ---- bind-8.1.2/src/lib/isc/ev_files.c~ Thu Feb 5 20:53:52 1998 -+++ bind-8.1.2/src/lib/isc/ev_files.c Wed Jan 6 17:46:18 1999 -@@ -139,9 +139,9 @@ - evPrintf(ctx, 5, - "evSelectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", - fd, eventmask, -- (u_long)ctx->rdNext.fds_bits[0], -- (u_long)ctx->wrNext.fds_bits[0], -- (u_long)ctx->exNext.fds_bits[0]); -+ __FDS_BITS(&ctx->rdNext)[0], -+ __FDS_BITS(&ctx->wrNext)[0], -+ __FDS_BITS(&ctx->exNext)[0]); - - return (0); - } -@@ -250,9 +250,9 @@ - evPrintf(ctx, 5, - "evDeselectFD(fd %d, mask 0x%x): new masks: 0x%lx 0x%lx 0x%lx\n", - del->fd, eventmask, -- (u_long)ctx->rdNext.fds_bits[0], -- (u_long)ctx->wrNext.fds_bits[0], -- (u_long)ctx->exNext.fds_bits[0]); -+ __FDS_BITS(&ctx->rdNext)[0], -+ __FDS_BITS(&ctx->wrNext)[0], -+ __FDS_BITS(&ctx->exNext)[0]); - - /* Couldn't free it before now since we were using fields out of it. */ - FREE(del); diff --git a/bind-host.patch b/bind-host.patch deleted file mode 100644 index f4de8e5..0000000 --- a/bind-host.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bind-8.2/src/bin/host/host.c.host Mon Jan 11 16:15:38 1999 -+++ bind-8.2/src/bin/host/host.c Wed Mar 31 10:51:54 1999 -@@ -1310,6 +1310,7 @@ - - amtToRead = len; - cp = buf.qb2; -+ if (amtToRead > NS_PACKETSZ) amtToRead=NS_PACKETSZ; - while (amtToRead > 0 && - (numRead = read(sockFD, cp, amtToRead)) > 0) { - cp += numRead; diff --git a/bind-mkdep.patch b/bind-mkdep.patch deleted file mode 100644 index 0b81fa0..0000000 --- a/bind-mkdep.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -ur src.old/lib/bsd/Makefile src/lib/bsd/Makefile ---- src.old/lib/bsd/Makefile Mon Feb 22 03:47:57 1999 -+++ src/lib/bsd/Makefile Mon May 24 15:24:40 1999 -@@ -79,7 +79,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/cylink/Makefile src/lib/cylink/Makefile ---- src.old/lib/cylink/Makefile Mon Feb 22 03:47:57 1999 -+++ src/lib/cylink/Makefile Mon May 24 15:24:58 1999 -@@ -81,7 +81,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/dnssafe/Makefile src/lib/dnssafe/Makefile ---- src.old/lib/dnssafe/Makefile Tue Feb 23 06:26:59 1999 -+++ src/lib/dnssafe/Makefile Mon May 24 15:24:13 1999 -@@ -98,7 +98,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/dst/Makefile src/lib/dst/Makefile ---- src.old/lib/dst/Makefile Sun Mar 7 10:33:47 1999 -+++ src/lib/dst/Makefile Mon May 24 15:25:19 1999 -@@ -83,7 +83,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] SRC/*.pl . -diff -ur src.old/lib/inet/Makefile src/lib/inet/Makefile ---- src.old/lib/inet/Makefile Wed Mar 3 09:07:16 1999 -+++ src/lib/inet/Makefile Mon May 24 15:27:19 1999 -@@ -80,7 +80,7 @@ - - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/irs/Makefile src/lib/irs/Makefile ---- src.old/lib/irs/Makefile Mon Feb 22 03:47:58 1999 -+++ src/lib/irs/Makefile Mon May 24 15:27:48 1999 -@@ -100,7 +100,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/isc/Makefile src/lib/isc/Makefile ---- src.old/lib/isc/Makefile Mon Feb 22 03:47:58 1999 -+++ src/lib/isc/Makefile Mon May 24 15:28:15 1999 -@@ -82,7 +82,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/nameser/Makefile src/lib/nameser/Makefile ---- src.old/lib/nameser/Makefile Mon Feb 22 03:47:59 1999 -+++ src/lib/nameser/Makefile Mon May 24 15:28:32 1999 -@@ -75,7 +75,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/lib/resolv/Makefile src/lib/resolv/Makefile ---- src.old/lib/resolv/Makefile Mon Feb 22 03:47:59 1999 -+++ src/lib/resolv/Makefile Mon May 24 15:28:50 1999 -@@ -79,7 +79,7 @@ - -rmdir ${THREADED} - - depend: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ ../../port/linux/bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] . -diff -ur src.old/port/linux/Makefile src/port/linux/Makefile ---- src.old/port/linux/Makefile Mon Feb 22 03:48:02 1999 -+++ src/port/linux/Makefile Mon May 24 15:22:43 1999 -@@ -67,7 +67,7 @@ - rm -f *.${O} *.BAK *.CKP *~ - - depend:: FRC -- mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} -+ bin/mkdep -I${INCL} -I${PORTINCL} ${CPPFLAGS} ${SRCS} - - links: FRC - @set -e; ln -s SRC/*.[ch] SRC/bin SRC/Makefile.set SRC/probe . diff --git a/bind-nonlist.patch b/bind-nonlist.patch deleted file mode 100644 index 6a791bc..0000000 --- a/bind-nonlist.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/bin/named/ns_udp.c.nonlist Wed Jun 10 03:54:37 1998 -+++ src/bin/named/ns_udp.c Wed Jun 10 03:57:14 1998 -@@ -34,7 +34,11 @@ - #include <ctype.h> - #include <errno.h> - #include <netdb.h> --#include <nlist.h> -+ -+#if defined(CHECK_UDP_SUM) || defined(FIX_UDP_SUM) -+#include <libelf/nlist.h> -+#endif -+ - #include <resolv.h> - #include <stdio.h> - #include <syslog.h> diff --git a/bind-pidfile.patch b/bind-pidfile.patch deleted file mode 100644 index 60ffdbb..0000000 --- a/bind-pidfile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN bind-8.2.2_P5.org/src/bin/named/ns_config.c bind-8.2.2_P5/src/bin/named/ns_config.c ---- bind-8.2.2_P5.org/src/bin/named/ns_config.c Tue Nov 9 00:09:42 1999 -+++ bind-8.2.2_P5/src/bin/named/ns_config.c Wed Feb 2 17:30:14 2000 -@@ -1445,8 +1445,10 @@ - return (NULL); - } - -+ /* If file isn't our or named is running as root */ -+ if ((geteuid() == 0) || (geteuid() != sb.st_uid)) - (void)unlink(filename); -- fd = open(filename, O_WRONLY|O_CREAT|O_EXCL, -+ fd = open(filename, O_WRONLY|O_CREAT|O_TRUNC, - S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH); - if (fd < 0) - return (NULL); diff --git a/bind-pmake.patch b/bind-pmake.patch index 38944ea..d90f5a3 100644 --- a/bind-pmake.patch +++ b/bind-pmake.patch @@ -1,23 +1,7 @@ -Only in bind-9.2.4: bind-pmake.patch -diff -ur bind-9.2.4-orig/lib/bind/make/rules.in bind-9.2.4/lib/bind/make/rules.in ---- bind-9.2.4-orig/lib/bind/make/rules.in 2004-03-15 05:44:47.000000000 +0100 -+++ bind-9.2.4/lib/bind/make/rules.in 2004-09-24 12:14:10.777828088 +0200 -@@ -49,8 +49,10 @@ - ### Makefile may define: - ### TARGETS - --all: subdirs ${TARGETS} -+all: touchfile ${TARGETS} - -+touchfile: subdirs -+ touch touchfile - ### - ### Subdirectories - ### -diff -ur bind-9.2.4-orig/lib/bind/Makefile.in bind-9.2.4/lib/bind/Makefile.in ---- bind-9.2.4-orig/lib/bind/Makefile.in 2004-09-24 12:09:25.000000000 +0200 -+++ bind-9.2.4/lib/bind/Makefile.in 2004-09-24 12:17:08.951741536 +0200 -@@ -96,11 +96,11 @@ +diff -ur bind-9.2.5.orig/lib/bind/Makefile.in bind-9.2.5/lib/bind/Makefile.in +--- bind-9.2.5.orig/lib/bind/Makefile.in 2005-03-23 23:06:54.000000000 +0100 ++++ bind-9.2.5/lib/bind/Makefile.in 2005-03-23 23:09:36.000000000 +0100 +@@ -100,11 +100,11 @@ @BIND9_MAKE_RULES@ @@ -31,10 +15,25 @@ diff -ur bind-9.2.4-orig/lib/bind/Makefile.in bind-9.2.4/lib/bind/Makefile.in ${LIBTOOL_MODE_LINK} \ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libbind.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ -diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in ---- bind-9.2.4-orig/lib/dns/Makefile.in 2004-09-24 12:10:43.000000000 +0200 -+++ bind-9.2.4/lib/dns/Makefile.in 2004-09-24 12:16:30.551579248 +0200 -@@ -99,11 +99,11 @@ +diff -ur bind-9.2.5.orig/lib/bind/make/rules.in bind-9.2.5/lib/bind/make/rules.in +--- bind-9.2.5.orig/lib/bind/make/rules.in 2004-10-20 02:14:53.000000000 +0200 ++++ bind-9.2.5/lib/bind/make/rules.in 2005-03-23 23:09:36.000000000 +0100 +@@ -49,8 +49,10 @@ + ### Makefile may define: + ### TARGETS + +-all: subdirs ${TARGETS} ++all: touchfile ${TARGETS} + ++touchfile: subdirs ++ touch touchfile + ### + ### Subdirectories + ### +diff -ur bind-9.2.5.orig/lib/dns/Makefile.in bind-9.2.5/lib/dns/Makefile.in +--- bind-9.2.5.orig/lib/dns/Makefile.in 2005-03-23 23:06:54.000000000 +0100 ++++ bind-9.2.5/lib/dns/Makefile.in 2005-03-23 23:09:36.000000000 +0100 +@@ -107,11 +107,11 @@ -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -48,7 +47,7 @@ diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in ${LIBTOOL_MODE_LINK} \ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libdns.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ -@@ -129,7 +129,7 @@ +@@ -137,7 +137,7 @@ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ ${GSSAPIOBJS} ${LIBS} @@ -57,18 +56,9 @@ diff -ur bind-9.2.4-orig/lib/dns/Makefile.in bind-9.2.4/lib/dns/Makefile.in touch timestamp installdirs: -@@ -177,5 +177,8 @@ - include/dns/rdatastruct.h code.h - subdirs: include/dns/enumtype.h include/dns/enumclass.h \ - include/dns/rdatastruct.h code.h -+$(OBJS): include/dns/enumtype.h include/dns/enumclass.h \ -+ include/dns/rdatastruct.h code.h - ${DNSOBJS}: include/dns/enumtype.h include/dns/enumclass.h \ - include/dns/rdatastruct.h -+ -diff -ur bind-9.2.4-orig/lib/isc/Makefile.in bind-9.2.4/lib/isc/Makefile.in ---- bind-9.2.4-orig/lib/isc/Makefile.in 2004-07-20 09:00:19.000000000 +0200 -+++ bind-9.2.4/lib/isc/Makefile.in 2004-09-24 12:15:16.713804296 +0200 +diff -ur bind-9.2.5.orig/lib/isc/Makefile.in bind-9.2.5/lib/isc/Makefile.in +--- bind-9.2.5.orig/lib/isc/Makefile.in 2004-07-20 09:00:19.000000000 +0200 ++++ bind-9.2.5/lib/isc/Makefile.in 2005-03-23 23:09:36.000000000 +0100 @@ -88,11 +88,11 @@ -DLIBAGE=${LIBAGE} \ -c ${srcdir}/version.c @@ -83,9 +73,9 @@ diff -ur bind-9.2.4-orig/lib/isc/Makefile.in bind-9.2.4/lib/isc/Makefile.in ${LIBTOOL_MODE_LINK} \ ${CC} ${ALL_CFLAGS} ${LDFLAGS} -o libisc.la -rpath ${libdir} \ -version-info ${LIBINTERFACE}:${LIBREVISION}:${LIBAGE} \ -diff -ur bind-9.2.4-orig/make/rules.in bind-9.2.4/make/rules.in ---- bind-9.2.4-orig/make/rules.in 2004-07-20 09:00:21.000000000 +0200 -+++ bind-9.2.4/make/rules.in 2004-09-24 12:14:10.788826416 +0200 +diff -ur bind-9.2.5.orig/make/rules.in bind-9.2.5/make/rules.in +--- bind-9.2.5.orig/make/rules.in 2004-07-20 09:00:21.000000000 +0200 ++++ bind-9.2.5/make/rules.in 2005-03-23 23:09:36.000000000 +0100 @@ -47,7 +47,10 @@ ### Makefile may define: ### TARGETS diff --git a/bind-probe_ipv6.patch b/bind-probe_ipv6.patch deleted file mode 100644 index 7c68cd0..0000000 --- a/bind-probe_ipv6.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN src.orig/port/linux/include/Makefile src/port/linux/include/Makefile ---- src.orig/port/linux/include/Makefile Tue May 18 08:42:52 1999 -+++ src/port/linux/include/Makefile Mon Aug 2 18:32:26 1999 -@@ -68,7 +68,7 @@ - all depend:: port_ipv6.h - - port_ipv6.h: FRC -- probe_ipv6 -+ ../bin/probe_ipv6 - - distclean:: clean - diff --git a/bind-pselect.patch b/bind-pselect.patch deleted file mode 100644 index 43ab757..0000000 --- a/bind-pselect.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/lib/isc/eventlib.c Sat Mar 21 00:26:24 1998 -+++ src.orig/lib/isc/eventlib.c Sat Dec 5 17:43:14 1998 -@@ -42,7 +42,11 @@ - #include "port_after.h" - - /* Forward. */ -- -+#if ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 1)) -+#include <sys/select.h> /* Another piece of shit from glibc guys ...;(( */ -+#undef NEED_PSELECT -+#endif /* glibc-2.1 */ -+ - #ifdef NEED_PSELECT - static int pselect(int, void *, void *, void *, struct timespec*); - #endif diff --git a/bind-res_randomid.patch b/bind-res_randomid.patch deleted file mode 100644 index 1b2ec71..0000000 --- a/bind-res_randomid.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bind-chroot-8.2.2_P5/src/lib/resolv/res_init.c.orig Sun Jan 9 12:47:08 2000 -+++ bind-chroot-8.2.2_P5/src/lib/resolv/res_init.c Sun Jan 9 12:55:35 2000 -@@ -92,6 +92,7 @@ - #include <unistd.h> - - #include "port_after.h" -+#undef res_randomid - - /* Options. Should all be left alone. */ - #define RESOLVSORT @@ -15,23 +15,23 @@ Summary(tr): DNS alan adý sunucusu Summary(uk): BIND - cÅÒ×ÅÒ ÓÉÓÔÅÍÉ ÄÏÍÅÎÎÉÈ ¦ÍÅÎ (DNS) Summary(zh_CN): Internet ÓòÃû·þÎñÆ÷ Name: bind -Version: 9.2.3 -Release: 9 -Epoch: 5 +Version: 9.2.5 +Release: 2 +Epoch: 6 License: BSD-like Group: Networking/Daemons Source0: ftp://ftp.isc.org/isc/bind9/%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 94ae7b0f20dc406fdbbf6fac5d57b32f +# Source0-md5: 35a265fb97a068c066e22306ea32fd1f Source1: %{name}-conf.tar.gz # Source1-md5: 8ee77729f806fcd548fe0cceb34b4a06 Source2: named.init Source3: named.sysconfig Source4: named.logrotate -Source5: nslookup.8 -Source6: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 -# Source6-md5: 35b1dfaa12615c9802126ee833e0e7f7 -Source7: http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt -# Source7-md5: c9a17d8cf8c1a6d4fad6138a1c3f36c4 +#Source5: nslookup.8 +Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 +# Source5-md5: 35b1dfaa12615c9802126ee833e0e7f7 +Source6: http://www.venaas.no/ldap/bind-sdb/dnszone-schema.txt +# Source6-md5: c9a17d8cf8c1a6d4fad6138a1c3f36c4 Patch0: %{name}-time.patch Patch1: %{name}-autoconf.patch Patch2: %{name}-includedir-libbind.patch @@ -40,6 +40,7 @@ Patch4: %{name}-pmake.patch # from idnkit Patch5: %{name}-idn.patch Patch6: %{name}-sdb-ldap.patch +Patch7: %{name}-destaddr.patch URL: http://www.isc.org/products/BIND/bind9.html BuildRequires: autoconf BuildRequires: automake @@ -49,7 +50,7 @@ BuildRequires: libtool BuildRequires: idnkit-devel %{?with_ldap:BuildRequires: openldap-devel} %{?with_ssl:BuildRequires: openssl-devel >= 0.9.7d} -BuildRequires: rpmbuild(macros) >= 1.159 +BuildRequires: rpmbuild(macros) >= 1.176 PreReq: %{name}-libs = %{epoch}:%{version}-%{release} PreReq: rc-scripts >= 0.2.0 Requires(pre): fileutils @@ -314,6 +315,7 @@ BIND. %patch4 -p1 %patch5 -p1 %{?with_ldap:%patch6 -p1} +%patch7 -p1 %build %{__libtoolize} @@ -344,8 +346,9 @@ install -d $RPM_BUILD_ROOT{%{_includedir},%{_bindir},%{_sbindir},%{_includedir}} rm -f doc/rfc/rfc* -install %{SOURCE5} $RPM_BUILD_ROOT%{_mandir}/man8 -bzip2 -dc %{SOURCE6} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +mv $RPM_BUILD_ROOT%{_mandir}/ja/man8/nslookup.8 $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1 +%{__perl} -pi -e 's/NSLOOKUP 8/NSLOOKUP 1/' $RPM_BUILD_ROOT%{_mandir}/ja/man1/nslookup.1 install conf-pld/*.zone $RPM_BUILD_ROOT%{_var}/lib/named/M install conf-pld/*.hint $RPM_BUILD_ROOT%{_var}/lib/named @@ -363,7 +366,7 @@ ln -sf %{_var}/lib/named/named.stats $RPM_BUILD_ROOT%{_var}/log/named.stats touch $RPM_BUILD_ROOT%{_var}/lib/named/{named.{log,stats},dev/{random,null}} %{?with_ldap:mkdir -p $RPM_BUILD_ROOT%{_datadir}/openldap/schema/} -%{?with_ldap:install %{SOURCE7} $RPM_BUILD_ROOT%{_datadir}/openldap/schema/dnszone.schema} +%{?with_ldap:install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/openldap/schema/dnszone.schema} # we don't want Makefiles in documentation... rm -f doc/misc/Makefile* @@ -372,27 +375,39 @@ rm -f doc/misc/Makefile* rm -rf $RPM_BUILD_ROOT %pre +%banner %{name}-prescript << EOF +EOF if [ -f %{_sysconfdir}/named.boot ]; then cp -f %{_sysconfdir}/named.boot /etc/named.boot.2conf mv -f %{_sysconfdir}/named.boot /etc/named.rpmsave - echo "Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave." 1>&2 + %banner %{name}-prescript -a -e << EOF +Warning: %{_sysconfdir}/named.boot saved as /etc/named.rpmsave. +EOF fi -if [ -n "`getgid named`" ]; then - if [ "`getgid named`" != "58" ]; then - echo "Error: group named doesn't have gid=58. Correct this before installing bind." 1>&2 +if [ -n "`/usr/bin/getgid named`" ]; then + if [ "`/usr/bin/getgid named`" != "58" ]; then + %banner %{name}-prescript -a -e << EOF +Error: group named doesn't have gid=58. Correct this before installing bind. +EOF exit 1 fi else - echo "Adding group named GID=58." + %banner %{name}-prescript -a << EOF +Adding group named GID=58. +EOF /usr/sbin/groupadd -g 58 named || exit 1 fi -if [ -n "`id -u named 2>/dev/null`" ]; then - if [ "`id -u named`" != "58" ]; then - echo "Error: user named doesn't have uid=58. Correct this before installing bind." 1>&2 +if [ -n "`/bin/id -u named 2>/dev/null`" ]; then + if [ "`/bin/id -u named`" != "58" ]; then + %banner %{name}-prescript -a -e << EOF +Error: user named doesn't have uid=58. Correct this before installing bind. +EOF exit 1 fi else - echo "Adding user named UID=58." + %banner %{name}-prescript -a << EOF +Adding user named UID=58. +EOF /usr/sbin/useradd -u 58 -g 58 -d /tmp -s /bin/false -c "BIND user" named || exit 1 fi @@ -401,7 +416,9 @@ fi if [ -f /var/lock/subsys/named ]; then /etc/rc.d/init.d/named restart 1>&2 else - echo "Type \"/etc/rc.d/init.d/named start\" to start named." 1>&2 + %banner %{name} -e << EOF +Type "/etc/rc.d/init.d/named start" to start named. +EOF fi %preun @@ -428,7 +445,7 @@ fi %attr(754,root,root) /etc/rc.d/init.d/named %attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/named %attr(640,root,named) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/named.conf -%attr(640,root,root) %config %verify(not size mtime md5) /etc/logrotate.d/named +%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/named %attr(755,root,root) %{_sbindir}/* @@ -442,7 +459,7 @@ fi %lang(ja) %{_mandir}/ja/man8/named* %attr(770,root,named) %dir %{_var}/lib/named -%attr(750,root,named) %dir %{_var}/lib/named/M +%attr(770,root,named) %dir %{_var}/lib/named/M %attr(770,root,named) %dir %{_var}/lib/named/S %attr(750,root,named) %dir %{_var}/lib/named%{_sysconfdir} %attr(770,root,named) %dir %{_var}/lib/named/dev @@ -463,8 +480,8 @@ fi %attr(755,root,root) %{_bindir}/nsupdate %{_mandir}/man1/dig.1* %{_mandir}/man1/host.1* -%{_mandir}/man8/nslookup.8* -%{_mandir}/man8/nsupdate* +%{_mandir}/man1/nslookup.1* +%{_mandir}/man8/nsupdate.8* %lang(fi) %{_mandir}/fi/man1/host.1* @@ -474,7 +491,7 @@ fi %lang(ja) %{_mandir}/ja/man1/dig.1* %lang(ja) %{_mandir}/ja/man1/host.1* -%lang(ja) %{_mandir}/ja/man8/nslookup.8* +%lang(ja) %{_mandir}/ja/man1/nslookup.1* %lang(ja) %{_mandir}/ja/man8/nsupdate.8* %lang(pl) %{_mandir}/pl/man1/host.1* diff --git a/bind9-openssl.patch b/bind9-openssl.patch deleted file mode 100644 index 6377eb9..0000000 --- a/bind9-openssl.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -urN bind-9.0.1rc2.org/configure.in bind-9.0.1rc2/configure.in ---- bind-9.0.1rc2.org/configure.in Tue Nov 7 11:04:02 2000 -+++ bind-9.0.1rc2/configure.in Wed Nov 8 11:15:29 2000 -@@ -184,12 +184,13 @@ - # - AC_MSG_CHECKING(for compatible OpenSSL library) - --DST_PRIVATEOPENSSL='-DDST_USE_PRIVATE_OPENSSL' --dst_privateopenssl='openssl' --DST_OPENSSL_INC='-I${srcdir}/../openssl/include' -+DNS_OPENSSL_LIBS="-lssl -lcrypto" -+DST_PRIVATEOPENSSL='' -+dst_privateopenssl='' -+DST_OPENSSL_INC='' - DST_OPENSSL_LIB='' --DST_OPENSSL_OBJS='${OPENSSLOBJS}' --AC_MSG_RESULT(using private library) -+DST_OPENSSL_OBJS='' -+AC_MSG_RESULT(using shared library) - - AC_SUBST(DST_PRIVATEOPENSSL) - AC_SUBST(dst_privateopenssl) -@@ -202,7 +203,6 @@ - # it as needed) if it is found. - # - --DNS_OPENSSL_LIBS="" - AC_SUBST(DNS_OPENSSL_LIBS) - - # diff --git a/host_991529+.diff b/host_991529+.diff deleted file mode 100644 index 73060f4..0000000 --- a/host_991529+.diff +++ /dev/null @@ -1,206 +0,0 @@ -diff -Nru host/Makefile host+/Makefile ---- host/Makefile Wed Mar 15 22:51:39 2000 -+++ host+/Makefile Wed Jun 14 01:01:09 2000 -@@ -60,6 +60,8 @@ - # This is the default in either case if you compile stand-alone. - CONFIGDEFS = -DHOST_RES_SEND - -+CONFIGDEFS = -DHOST_RES_SEND -DIPV6 -+ - # ---------------------------------------------------------------------- - # Include file directories. - # This program must be compiled with the same include files that -diff -Nru host/README.ip6.int host+/README.ip6.int ---- host/README.ip6.int Thu Jan 1 01:00:00 1970 -+++ host+/README.ip6.int Wed Jun 14 01:05:05 2000 -@@ -0,0 +1,17 @@ -+Use -DIPV6 in the Makefile to turn IPv6 addresses recognition. This -+version of host recognizes IPv6 addresses in the following formats: -+ -+3ffe:8010:: normal format of a host (mask 128) address -+3ffe:8010::1 normal format of a host (mask 128) address -+3ffe:8010::/28 with mask -+3ffe:8010:2::/28 with mask; :2: will be masked -+3ffe:8010:2 relaxed format; default mask will be 48 in this case -+3ffe:8010/28 default mask 32 but shorten explicitely to 28 -+ -+All of the above addresses will be transformed into ip6.int domain form, -+e.g. 3ffe:8010/28 -> 1.0.8.E.F.F.3.ip6.int. ::/0 can be used to ask -+about just ip6.int. -+ -+There no IPv6 communication support yet. -+ -+rzm@icm.edu.pl -diff -Nru host/defs.h host+/defs.h ---- host/defs.h Wed Mar 29 20:19:00 2000 -+++ host+/defs.h Tue Jun 13 18:39:39 2000 -@@ -87,6 +87,7 @@ - int parse_type PROTO((char *)); - int parse_class PROTO((char *)); - char *in_addr_arpa PROTO((char *)); -+char *ip6_int PROTO((char *)); - char *nsap_int PROTO((char *)); - void print_host PROTO((char *, struct hostent *)); - void show_res PROTO((void)); -diff -Nru host/info.c host+/info.c ---- host/info.c Mon Mar 27 12:59:11 2000 -+++ host+/info.c Tue Jun 13 21:06:15 2000 -@@ -63,6 +63,7 @@ - int nodata = 0; /* NO_DATA status during DNSRCH */ - int nquery = 0; /* number of extra search queries */ - -+ if (name==NULL) return FALSE; - /* - * Single dot means root zone. - */ -diff -Nru host/main.c host+/main.c ---- host/main.c Wed Mar 29 22:38:09 2000 -+++ host+/main.c Wed Jun 14 00:55:58 2000 -@@ -1273,6 +1273,7 @@ - input char *name; /* command line argument */ - { - bool result; /* result status of action taken */ -+ bool rev6 = FALSE; - - /* check for nonsense input name */ - if (strlength(name) > MAXDNAME) -@@ -1297,6 +1298,13 @@ - else - queryaddr = inet_addr(queryname); - -+#ifdef IPV6 -+ if (index(queryname,':')) { -+ rev6 = TRUE; -+ queryname = ip6_int(queryname); -+ } -+#endif -+ - /* - * Generate reverse in-addr.arpa query if so requested. - * The input name must be a dotted quad, and be convertible. -@@ -1304,7 +1312,11 @@ - if (reverse) - { - if (queryaddr == NOT_DOTTED_QUAD) -- name = NULL; -+ if (rev6) { -+ name = ip6_int(queryname); -+ } else { -+ name = NULL; -+ } - else - name = in_addr_arpa(queryname); - -@@ -1323,18 +1335,18 @@ - * Heuristic to check whether we are processing a reverse mapping domain. - * Normalize to not have trailing dot, unless it is the root zone. - */ -- if ((queryaddr == NOT_DOTTED_QUAD) && !reverse) -+ if ((queryaddr == NOT_DOTTED_QUAD) && !rev6 && !reverse) - { - char namebuf[MAXDNAME+1]; - register int n; - -- name = strcpy(namebuf, queryname); -+ name = strncpy(namebuf, queryname, sizeof(namebuf)); - - n = strlength(name); - if (n > 1 && name[n-1] == '.') - name[n-1] = '\0'; - -- reverse = indomain(name, ARPA_ROOT, FALSE); -+ reverse = indomain(name, ARPA_ROOT, FALSE) || indomain(name, IPNG_ROOT, FALSE); - } - - /* -@@ -1370,7 +1382,7 @@ - /* set querytype for regular mode if unspecified */ - if ((querytype == T_NONE) && !listmode) - { -- if ((queryaddr != NOT_DOTTED_QUAD) || reverse) -+ if ((queryaddr != NOT_DOTTED_QUAD) || rev6 || reverse) - querytype = T_PTR; - else - querytype = T_A; -diff -Nru host/util.c host+/util.c ---- host/util.c Mon Mar 27 13:34:15 2000 -+++ host+/util.c Wed Jun 14 01:00:08 2000 -@@ -209,6 +209,78 @@ - } - - /* -+** IP6_INT -- Convert IPv6 string to reverse ip6.int -+** ------------------------------------------------------------------ -+** -+** Returns: -+** Pointer to appropriate reverse ip6.int name with -+** trailing dot to force absolute domain name. NULL -+** in case of invalid IPv6 input string. -+*/ -+ -+char * -+ip6_int(ipv6) -+input char *ipv6; /* input string with IPv6 */ -+{ -+ static char dombuf[ 128/4*3 + sizeof(IPNG_ROOT) + 2]; -+#ifdef IPV6 -+ char ipv6addr [8*4 + 7 + 1 + 3 + 2], *mask, *p, buf2[5]; -+ struct in6_addr ip6buf; -+ int nmask = -1, err, i, colons = 0; -+ -+ strncpy(ipv6addr, ipv6, sizeof(ipv6addr)); -+ -+ mask = index(ipv6addr, '/'); -+ if (mask) { -+ *mask = '\0'; -+ mask++; -+ nmask = atoi(mask); -+ } -+ -+ p = ipv6addr; while(*p) if (*p++==':') colons++; -+/* printf("addr: %s, colons: %d, last: %c\n", ipv6addr, colons, p[-1]); */ -+ -+ /* relaxing address format: remove last : */ -+ if ( (p-ipv6addr>=2) && (p[-1]==':') && (p[-2]!=':') ) p[-1] = '\0'; -+ -+ /* mask not set, derived from non-standard formatted address */ -+ if ( (colons<7) && (p[-1]!=':') && (strstr(ipv6addr,"::")==0) ) { -+ strcat(ipv6addr, "::"); -+ if (nmask==-1) nmask = (colons+1)*16; -+ } -+ -+ if (nmask==-1) nmask = 128; -+ -+ err = inet_pton(AF_INET6, ipv6addr, &ip6buf); -+ if (err == -1) { -+ errmsg("Address (%s) format error: %s", ipv6, strerror(errno)); -+ return ipv6; -+ } -+ if (err == 0) { -+ errmsg("Address `%s' not valid"); -+ return ipv6; -+ } -+ -+/* for (i=0; i<16; i++) printf("%02X ", ip6buf.s6_addr[i]); printf("/%d\n", nmask); */ -+ -+ nmask -= nmask%4; -+ dombuf[0] = '\0'; -+ while (nmask>0) { -+ if (nmask%8==0) { -+ sprintf(buf2, "%X.", ip6buf.s6_addr[(nmask-1)/8] % 16); -+ } else { -+ sprintf(buf2, "%X.", ip6buf.s6_addr[(nmask-1)/8] / 16); -+ } -+ strcat(dombuf, buf2); -+ nmask -= 4; /* 8 bits at a time */ -+ } -+ strcat(dombuf, IPNG_ROOT); -+ strcat(dombuf, "."); -+#endif -+ return dombuf; -+} -+ -+/* - ** NSAP_INT -- Convert dotted nsap address string to reverse nsap.int - ** ------------------------------------------------------------------ - ** diff --git a/named-chroot.init b/named-chroot.init deleted file mode 100644 index 6f69168..0000000 --- a/named-chroot.init +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh -# -# named This shell script takes care of starting and stopping -# named (BIND DNS server). -# -# chkconfig: 345 55 45 -# description: named (BIND) is a Domain Name Server (DNS) \ -# that is used to resolve host names to IP addresses. - -# Source function library -. /etc/rc.d/init.d/functions - -# Source networking configuration -. /etc/sysconfig/network - -# Try get config.. -[ -f /etc/sysconfig/named ] && . /etc/sysconfig/named - -# Check that networking is up. -if is_yes "${NETWORKING}"; then - if [ ! -f /var/lock/subsys/network ]; then - msg_network_down "Named" - exit 1 - fi -else - exit 0 -fi - -# Sanity check -[ -f /etc/named.conf ] || exit 0 - -RETVAL=0 -# See how we were called. -case "$1" in - start) - # Check if the service is already running? - if [ ! -f /var/lock/subsys/named ]; then - msg_starting "holelogd.named" - daemon holelogd.named /var/lib/named/chroot/dev/log - RETVAL=$? - [ $RETVAL -eq 0 ] || exit 1 - msg_starting "Named" - touch /var/log/named && chown named.named /var/log/named - daemon /var/lib/named/chroot/usr/sbin/named \ - -u named -g named -t /var/lib/named/chroot - RETVAL=$? - if [ $RETVAL -eq 0 ]; then - touch /var/lock/subsys/named - chown named.named /var/lib/named/chroot/var/run/named.pid - ln -sf /var/lib/named/chroot/var/run/named.pid /var/run/named.pid - fi - else - msg_already_running "Named" - fi - ;; - stop) - if [ -f /var/lock/subsys/named ]; then - msg_stopping "Named" - killproc named - msg_stopping "holelogd.named" - killproc holelogd.named - rm -f /var/lock/subsys/named >/dev/null 2>&1 - else - msg_not_running "Named" - fi - ;; - status) - /usr/sbin/ndc.chroot status - exit $? - ;; - reload|force-reload) - if [ -f /var/lock/subsys/named ]; then - msg_reloading "Named" - killproc named -HUP - RETVAL=$? - else - msg_not_running "Named" >&2 - exit 7 - fi - - ;; - restart) - $0 stop - $0 start - exit $? - ;; - *) - msg_usage "$0 {start|stop|restart|reload|force-reload|status}" - exit 3 -esac - -exit $RETVAL diff --git a/named.conf b/named.conf deleted file mode 100644 index 772b711..0000000 --- a/named.conf +++ /dev/null @@ -1,65 +0,0 @@ -// This is an exaple configuration file for named ( /etc/named.conf ) -// Przyk³adowy plik konfiguracyjny /etc/named.conf dla serwera nazw `named' - -options { - directory "/var/lib/named"; - check-names master fail; -// check-names slave warn; - check-names response ignore; - datasize default; - deallocate-on-exit no; - host-statistics no; - fake-iquery no; -}; - -controls { - unix "/var/run/ndc" perm 0600 owner 0 group 0; -}; - - -zone "localhost" IN { - type master; - file "M/localhost.zone"; - check-names fail; - allow-update { none; }; - allow-transfer { any; }; -}; - -zone "0.0.127.in-addr.arpa" IN { - type master; - file "M/127.0.0.zone"; - check-names fail; - allow-update { none; }; - allow-transfer { any; }; -}; - -zone "." IN { - type hint; - file "root.hint"; -}; - -//zone "pld-linux.org" IN { -// type slave; -// file "S/pld-linux.org.zone"; -// masters { -// 195.116.211.3; -// }; -// check-names warn; -// allow-query { any; }; -// allow-transfer { any; }; -// }; - -logging { - channel xfer-log { - file "/var/log/named"; - print-category yes; - print-severity yes; - print-time yes; - severity info; - }; - category xfer-in { xfer-log; }; - category xfer-out { xfer-log; }; - category notify { xfer-log; }; - category load { xfer-log; }; -}; - diff --git a/nslookup.8 b/nslookup.8 deleted file mode 100644 index 5f449dd..0000000 --- a/nslookup.8 +++ /dev/null @@ -1,534 +0,0 @@ -.\" -.\" ++Copyright++ 1985, 1989 -.\" - -.\" Copyright (c) 1985, 1989 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -.\" SUCH DAMAGE. -.\" - -.\" Portions Copyright (c) 1993 by Digital Equipment Corporation. -.\" -.\" Permission to use, copy, modify, and distribute this software for any -.\" purpose with or without fee is hereby granted, provided that the above -.\" copyright notice and this permission notice appear in all copies, and that -.\" the name of Digital Equipment Corporation not be used in advertising or -.\" publicity pertaining to distribution of the document or software without -.\" specific, written prior permission. -.\" -.\" THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL -.\" WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES -.\" OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT -.\" CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL -.\" DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR -.\" PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS -.\" ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS -.\" SOFTWARE. -.\" - -.\" --Copyright-- -.\" -.\" @(#)nslookup.8 5.3 (Berkeley) 6/24/90 -.\" -.Dd June 24, 1990 -.Dt NSLOOKUP 8 -.Os BSD 4 -.Sh NAME -.Nm nslookup -.Nd query Internet name servers interactively -.Sh SYNOPSIS -.Nm nslookup -.Op Fl option Ar ... -.Op Ar host-to-find | Fl Op Ar server -.Sh DESCRIPTION -.Ic Nslookup -is a program to query Internet domain name servers. -.Ic Nslookup -has two modes: interactive and non-interactive. -Interactive mode allows the user to query name servers for -information about various hosts and domains or to print a list of hosts -in a domain. -Non-interactive mode is used to print just the name and requested information -for a host or domain. -.Sh ARGUMENTS -Interactive mode is entered in the following cases: -.Bl -tag -width "a) " -.It a) -when no arguments are given (the default name server will be used), -.It b) -when the first argument is a hyphen (-) and the second argument -is the host name or Internet address of a name server. -.El -.Pp -Non-interactive mode is used when the name or Internet address -of the host to be looked up -is given as the first argument. The optional second argument specifies -the host name or address of a name server. -.Pp -The options listed under the -.Dq Li set -command below can be specified in -the -.Pa .nslookuprc -file in the user's home directory if they are listed -one per line. Options can also be specified -on the command line if they precede the arguments and are prefixed with -a hyphen. For example, to change the default query type to host information, -and the initial timeout to 10 seconds, type: -.Bd -literal -offset indent - nslookup -query=hinfo -timeout=10 -.Ed -.Sh INTERACTIVE COMMANDS -Commands may be interrupted at any time by typing a control-C. -To exit, type a control-D -.Pq Dv EOF -or type -.Li exit . -The command line length must be less than 256 characters. -To treat a built-in command as a host name, -precede it with an escape character -.Pq .&\\ . -.Sy N.B.: An unrecognized command will be interpreted as a host name. -.Bl -tag -width "lserver" -.It Ar host Op Ar server -Look up information for -.Ar host -using the current default server or using -.Ar server , -if specified. -If -.Ar host -is an Internet address and the query type is -.Dv A -or -.Dv PTR , -the name of the host is returned. -If -.Ar host -is a name and does not have a trailing period, the default -domain name is appended to the name. (This behavior depends on the state of the -.Ic set -options -.Ic domain , srchlist , defname , -and -.Ic search . ) -.Pp -To look up a host not in the current domain, append a period to -the name. -.It Ic server Ar domain -.It Ic lserver Ar domain -Change the default server to -.Ar domain ; -.Ic lserver -uses the initial server to look up information about -.Ar domain , -while -.Ic server -uses the current default server. -If an authoritative answer can't be found, the names of servers -that might have the answer are returned. -.It Ic root -Changes the default server to the server for the root of the domain name space. -Currently, the host -.Li ns.internic.net -is used. -(This command is a synonym for -.Dq Ic lserver ns.internic.net . ) -The name of the root server can be changed with the -.Dq Ic set root -command. -.It Xo Ic finger Op Ar name -.Op Ic > Ar filename -.Xc -.It Xo Ic finger Op Ar name -.Op Ic >> Ar filename -.Xc -Connects with the finger server on the current host. -The current host is defined when a previous lookup for a host -was successful and returned address information (see the -.Dq Ic set querytype=A -command). -The -.Ar name -is optional. -.Ic > -and -.Ic >> -can be used to redirect output in the usual manner. -.It Xo Ic ls Op Ar option -.Ar domain Op Ic > Ar filename -.Xc -.It Xo Ic ls Op Ar option -.Ar domain Op Ic >> Ar filename -.Xc -List the information available for -.Ar domain , -optionally creating or appending to -.Ar filename . -The default output contains host names and their Internet addresses. -.Ar Option -can be one of the following: -.Bl -tag -width "-a " -.It Fl t Ar querytype -lists all records of the specified type (see -.Ar querytype -below). -.It Fl a -lists aliases of hosts in the domain; -synonym for -.Dq Fl t Dv CNAME . -.It Fl d -lists all records for the domain; -synonym for -.Dq Fl t Dv ANY . -.It Fl h -lists CPU and operating system information for the domain; -synonym for -.Dq Fl t Dv HINFO . -.It Fl s -lists well-known services of hosts in the domain; -synonym for -.Dq Fl t Dv WKS . -.El -.Pp -When output is directed to a file, hash marks are printed for every -50 records received from the server. -.It Ic view Ar filename -Sorts and lists the output of previous -.Ic ls -command(s) with -.Xr more 1 . -.It Ic help -.It Ic ? -Prints a brief summary of commands. -.It Ic exit -Exits the program. -.It Xo Ic set Ar keyword -.Ns Op = Ns Ar value -.Xc -This command is used to change state information that affects the lookups. -Valid keywords are: -.Bl -tag -width "class=v" -.It Ic all -Prints the current values of the frequently-used options to -.Ic set . -Information about the current default server and host is also printed. -.It Ic class= Ns Ar value -Change the query class to one of: -.Bl -tag -width "HESIOD " -.It Dv IN -the Internet class -.It Dv CHAOS -the Chaos class -.It Dv HESIOD -the MIT Athena Hesiod class -.It Dv ANY -wildcard (any of the above) -.El -.Pp -The class specifies the protocol group of the information. -.Pp -(Default = -.Dv IN ; -abbreviation = -.Ic cl ) -.It Xo Op Ic no -.Ns Ic debug -.Xc -Turn debugging mode on. A lot more information is printed about the -packet sent to the server and the resulting answer. -.Pp -(Default = -.Ic nodebug ; -abbreviation = -.Xo Op Ic no -.Ns Ic deb ) -.Xc -.It Xo Op Ic no -.Ns Ic d2 -.Xc -Turn exhaustive debugging mode on. -Essentially all fields of every packet are printed. -.Pp -(Default = -.Ic nod2 ) -.It Ic domain= Ns Ar name -Change the default domain name to -.Ar name . -The default domain name is appended to a lookup request depending on the -state of the -.Ic defname -and -.Ic search -options. -The domain search list contains the parents of the default domain if it has -at least two components in its name. -For example, if the default domain -is CC.Berkeley.EDU, the search list is CC.Berkeley.EDU and Berkeley.EDU. -Use the -.Dq Ic set srchlist -command to specify a different list. -Use the -.Dq Ic set all -command to display the list. -.Pp -(Default = value from -.Xr hostname 1 , -.Pa /etc/resolv.conf , -or -.Ev LOCALDOMAIN; -abbreviation = -.Ic do ) -.It Ic srchlist= Ns Ar name1/name2/... -Change the default domain name to -.Ar name1 -and the domain search list -to -.Ar name1 , name2 , -etc. A maximum of 6 names separated by slashes (/) -can be specified. -For example, -.Bd -literal -offset indent -set srchlist=lcs.MIT.EDU/ai.MIT.EDU/MIT.EDU -.Ed -.Pp -sets the domain to lcs.MIT.EDU and the search list to the three names. -This command overrides the -default domain name and search list of the -.Dq Ic set domain -command. -Use the -.Dq Ic set all -command to display the list. -.Pp -(Default = value based on -.Xr hostname 1 , -.Pa /etc/resolv.conf , -or -.Ev LOCALDOMAIN; -abbreviation = -.Ic srchl ) -.It Xo Op Ic no -.Ns Ic defname -.Xc -If set, append the default domain name to a single-component lookup request -(i.e., one that does not contain a period). -.Pp -(Default = -.Ic defname ; -abbreviation = -.Xo Op Ic no -.Ns Ic defname ) -.Xc -.It Xo Op Ic no -.Ns Ic search -.Xc -If the lookup request contains at least one period but -.Em doesn't -end with a trailing period, append the domain names in the domain search list -to the request until an answer is received. -.Pp -(Default = -.Ic search ; -abbreviation = -.Xo Op Ic no -.Ns Ic sea ) -.Xc -.It Ic port= Ns Ar value -Change the default TCP/UDP name server port to -.Ar value . -.Pp -(Default = 53; -abbreviation = -.Ic \&po ) -.It Ic querytype= Ns Ar value -.It Ic type= Ns Ar value -Change the type of information query to one of: -.Bl -tag -width "HINFO " -.It Dv A -the host's Internet address. -.It Dv CNAME -the canonical name for an alias. -.It Dv HINFO -the host CPU and operating system type. -.It Dv MINFO -the mailbox or mail list information. -.It Dv MX -the mail exchanger. -.It Dv NS -the name server for the named zone. -.It Dv PTR -the host name if the query is an Internet address; -otherwise, the pointer to other information. -.It Dv SOA -the domain's -.Dq start-of-authority -information. -.It Dv TXT -the text information. -.It Dv UINFO -the user information. -.It Dv WKS -the supported well-known services. -.El -.Pp -Other types -.Pq Dv ANY, AXFR, MB, MD, MF, NULL -are described in the RFC-1035 document. -.Pp -(Default = -.Dv A ; -abbreviations = -.Ic q , ty ) -.It Xo Op Ic no -.Ns Ic recurse -.Xc -Tell the name server to query other servers if it does not have the -information. -.Pp -(Default = -.Ic recurse ; -abbreviation = -.Xo Op Ic no -.Ns Ic rec ) -.Xc -.It Ic retry= Ns Ar number -Set the number of retries to -.Ar number . -When a reply to a request is not received within a certain -amount of time (changed with -.Dq Ic set timeout ) , -the timeout period is doubled and the request is resent. -The retry value controls how many times a request is resent before giving up. -.Pp -(Default = 4, abbreviation = -.Ic ret ) -.It Ic root= Ns Ar host -Change the name of the root server to -.Ar host . -This affects the -.Dq Ic root -command. -.Pp -(Default = -.Ic ns.internic.net. ; -abbreviation = -.Ic ro ) -.It Ic timeout= Ns Ar number -Change the initial timeout interval for waiting for a reply to -.Ar number -seconds. Each retry doubles the timeout period. -.Pp -(Default = 5 seconds; abbreviation = -.Ic ti ) -.It Xo Op Ic no -.Ns Ic vc -.Xc -Always use a virtual circuit when sending requests to the server. -.Pp -(Default = -.Ic novc ; -abbreviation = -.Xo Op Ic no -.Ns Ic v ) -.Xc -.It Xo Op Ic no -.Ns Ic ignoretc -.Xc -Ignore packet truncation errors. -.Pp -(Default = -.Ic noignoretc ; -abbreviation = -.Xo Op Ic no -.Ns Ic ig ) -.Xc -.El -.El -.Sh DIAGNOSTICS -If the lookup request was not successful, an error message is printed. -Possible errors are: -.Bl -tag -width "Timed" -.It Li Timed out -The server did not respond to a request after a certain amount of -time (changed with -.Dq Ic set timeout= Ns Ar value ) -and a certain number of retries (changed with -.Dq Ic set retry= Ns Ar value ) . -.It Li \&No response from server -No name server is running on the server machine. -.It Li \&No records -The server does not have resource records of the current query type for the -host, although the host name is valid. -The query type is specified with the -.Dq Ic set querytype -command. -.It Li Non-existent domain -The host or domain name does not exist. -.It Li Connection refused -.It Li Network is unreachable -The connection to the name or finger server could not be made -at the current time. -This error commonly occurs with -.Ic ls -and -.Ic finger -requests. -.It Li Server failure -The name server found an internal inconsistency in its database -and could not return a valid answer. -.It Li Refused -The name server refused to service the request. -.It Li Format error -The name server found that the request packet was not in the proper format. -It may indicate an error in -.Nm nslookup . -.El -.Sh FILES -.Bl -tag -width "/usr/share/misc/nslookup.helpXXX" -compact -.It Pa /etc/resolv.conf -initial domain name and name server addresses -.It Pa $HOME/.nslookuprc -user's initial options -.It Pa /usr/share/misc/nslookup.help -summary of commands -.Sh ENVIRONMENT -.Bl -tag -width "HOSTALIASESXXXX" -compact -.It Ev HOSTALIASES -file containing host aliases -.It Ev LOCALDOMAIN -overrides default domain -.Sh SEE ALSO -.Xr named 8 , -.Xr resolver 3 , -.Xr resolver 5 ; -RFC-1034, -.Dq Domain Names - Concepts and Facilities ; -RFC-1035, -.Dq Domain Names - Implementation and Specification . -.Sh AUTHOR -Andrew Cherenson diff --git a/resolver.5 b/resolver.5 deleted file mode 100644 index 11c0e08..0000000 --- a/resolver.5 +++ /dev/null @@ -1,224 +0,0 @@ -.\" Copyright (c) 1986 The Regents of the University of California. -.\" All rights reserved. -.\" -.\" Redistribution and use in source and binary forms are permitted -.\" provided that the above copyright notice and this paragraph are -.\" duplicated in all such forms and that any documentation, -.\" advertising materials, and other materials related to such -.\" distribution and use acknowledge that the software was developed -.\" by the University of California, Berkeley. The name of the -.\" University may not be used to endorse or promote products derived -.\" from this software without specific prior written permission. -.\" THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR -.\" IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED -.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -.\" -.\" @(#)resolver.5 5.9 (Berkeley) 12/14/89 -.\" $Id$ -.\" -.Dd November 11, 1993 -.Dt RESOLVER 5 -.Os BSD 4 -.Sh NAME -.Nm resolver -.Nd resolver configuration file -.Sh SYNOPSIS -.Pa /etc/resolv.conf -.Sh DESCRIPTION -The -.Nm resolver -is a set of routines in the C library -.Pq Xr resolve 3 -that provide access to the Internet Domain Name System. -The -.Nm resolver -configuration file contains information that is read -by the -.Nm resolver -routines the first time they are invoked by a process. -The file is designed to be human readable and contains a list of -keywords with values that provide various types of -.Nm resolver -information. -.Pp -On a normally configured system, this file should not be necessary. -The only name server to be queried will be on the local machine, -the domain name is determined from the host name, -and the domain search path is constructed from the domain name. -.Pp -The different configuration directives are: -.Bl -tag -width "nameser" -.It Li nameserver -Internet address (in dot notation) of a name server that the -.Nm resolver -should query. Up to -.Dv MAXNS -(see -.Pa <resolv.h> ) -name servers may be listed, one per keyword. -If there are multiple servers, the -.Nm resolver -library queries them in the order listed. -If no -.Li nameserver -entries are present, the default is to use the name server on the local machine. -(The algorithm used is to try a name server, and if the query times out, -try the next, until out of name servers, -then repeat trying all the name servers -until a maximum number of retries are made). -.It Li domain -Local domain name. -Most queries for names within this domain can use short names -relative to the local domain. -If no -.Li domain -entry is present, the domain is determined from the local host name returned by -.Xr gethostname 2 ; -the domain part is taken to be everything after the first -.Sq \&. . -Finally, if the host name does not contain a domain part, the root -domain is assumed. -.It Li search -Search list for host-name lookup. -The search list is normally determined from the local domain name; -by default, it contains only the local domain name. -This may be changed by listing the desired domain search path -following the -.Li search -keyword with spaces or tabs separating the names. -Most -.Nm resolver -queries will be attempted using each component -of the search path in turn until a match is found. -Note that this process may be slow and will generate a lot of network -traffic if the servers for the listed domains are not local, -and that queries will time out if no server is available -for one of the domains. -.Pp -The search list is currently limited to six domains -with a total of 256 characters. -.It Li sortlist -Allows addresses returned by gethostbyname to be sorted. -A -.Li sortlist -is specified by IP address netmask pairs. The netmask is -optional and defaults to the natural netmask of the net. The IP address -and optional network pairs are separated by slashes. Up to 10 pairs may -be specified. For example: -.Bd -literal -offset indent -sortlist 130.155.160.0/255.255.240.0 130.155.0.0 -.Ed -.It Li options -Allows certain internal -.Nm resolver -variables to be modified. -The syntax is -.D1 Li options Ar option ... -where -.Ar option -is one of the following: -.Bl -tag -width "ndots:n " -.It Li debug -sets -.Dv RES_DEBUG -in -.Ft _res.options . -.It Li ndots: Ns Ar n -sets a threshold for the number of dots which -must appear in a name given to -.Fn res_query -(see -.Xr resolver 3 ) -before an -.Em initial absolute query -will be made. The default for -.Ar n -is -.Dq 1 , -meaning that if there are -.Em any -dots in a name, the name will be tried first as an absolute name before any -.Em search list -elements are appended to it. -.It Li timeout: Ns Ar n -sets the amount of time the resolver will wait for a response from a remote -name server before retrying the query via a different name server. Measured in -seconds, the default is -.Dv RES_TIMEOUT -(see -.Pa <resolv.h> ). -.It Li attempts: Ns Ar n -sets the number of times the resolver will send a query to its name servers -before giving up and returning an error to the calling application. The -default is -.Dv RES_DFLRETRY -(see -.Pa <resolv.h> ). -.It Li rotate -sets -.Dv RES_ROTATE -in -.Ft _res.options , -which causes round robin selection of nameservers from among those listed. -This has the effect of spreading the query load among all listed servers, -rather than having all clients try the first listed server first every time. -.It Li no-check-names -sets -.Dv RES_NOCHECKNAME -in -.Ft _res.options , -which disables the modern BIND checking of incoming host names and mail names -for invalid characters such as underscore (_), non-ASCII, or control characters. -.It Li inet6 -sets -.Dv RES_USE_INET6 -in -.Ft _res.options . -This has the effect of trying a AAAA query before an A query inside the -.Ft gethostbyname -function, and of mapping IPv4 responses in IPv6 ``tunnelled form'' if no -AAAA records are found but an A record set exists. -.El -.El -.Pp -The -.Li domain -and -.Li search -keywords are mutually exclusive. -If more than one instance of these keywords is present, -the last instance wins. -.Pp -The -.Li search -keyword of a system's -.Pa resolv.conf -file can be -overridden on a per-process basis by setting the environment variable -.Dq Ev LOCALDOMAIN -to a space-separated list of search domains. -.Pp -The -.Li options -keyword of a system's -.Pa resolv.conf -file can be amended on a per-process basis by setting the environment variable -.Dq Ev RES_OPTIONS to a space-separated list of -.Nm resolver -options as explained above under -.Li options . -.Pp -The keyword and value must appear on a single line, and the keyword -(e.g., -.Li nameserver ) -must start the line. The value follows the keyword, separated by white space. -.Sh FILES -.Pa /etc/resolv.conf -.Pa <resolv.h> -.Sh SEE ALSO -.Xr gethostbyname 3 , -.Xr hostname 7 , -.Xr named 8 , -.Xr resolver 3 , -.Xr resolver 5 . -.Dq Name Server Operations Guide for Sy BIND diff --git a/utils-holelogd-linux.patch b/utils-holelogd-linux.patch deleted file mode 100644 index b20bac4..0000000 --- a/utils-holelogd-linux.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- bind-chroot-8.2.2_P5/utils-1.0/holelogd.c.orig Sun Sep 15 22:39:42 1996 -+++ bind-chroot-8.2.2_P5/utils-1.0/holelogd.c Sun Jan 9 18:26:33 2000 -@@ -64,10 +64,10 @@ - (void)unlink(holename); - unxls.sun_family = AF_UNIX; - (void) strncpy(unxls.sun_path, holename, sizeof unxls.sun_path); -- listenfd = socket(AF_UNIX, SOCK_STREAM, 0); -+ listenfd = socket(AF_UNIX, SOCK_DGRAM, 0); - if (listenfd < 0 || bind(listenfd, (struct sockaddr *) &unxls, - sizeof(unxls.sun_family)+strlen(unxls.sun_path)) < 0 || -- chmod(holename, 0666) < 0 || listen(listenfd, 5) < 0) { -+ chmod(holename, 0666) < 0) { - syslog(LOG_ERR, "Can't create AF_UNIX listen socket %s (%m) - exiting", - holename); - exit(1); -@@ -77,7 +77,7 @@ - - logaddr.sa_family = AF_UNIX; - (void) strncpy(logaddr.sa_data, logname, sizeof(logaddr.sa_data)); -- logfd = socket(AF_UNIX, SOCK_STREAM, 0); -+ logfd = socket(AF_UNIX, SOCK_DGRAM, 0); - if (logfd < 0) { - syslog(LOG_ERR, "Can't create AF_UNIX socket (%m) - exiting"); - exit(1); -@@ -118,14 +118,6 @@ - for (fd = 0; fd < FD_SETSIZE; fd++) { - if (FD_ISSET(fd, &readfds)) { - if (fd == listenfd) { -- int len; -- len = sizeof(unxs); -- fd = accept(listenfd, (struct sockaddr *)&unxs, &len); -- if (fd >= 0) { -- FD_SET(fd, &cfds); -- } -- } -- else { - int i; - char buf[1024]; - i = read(fd, buf, 1024); |