Sprout from master 2000-09-17 22:11:28 UTC kloczek <kloczek@pld-linux.org> '- adapterized.'
Delete:
bind-chroot-ndc.patch
bind-fds.patch
bind-glibc21.patch
bind-host-forcetype.patch
bind-host.patch
bind-mkdep.patch
bind-nonlist.patch
bind-pidfile.patch
bind-probe_ipv6.patch
bind-pselect.patch
bind-res_randomid.patch
bind-ttl.patch
named-chroot.init
named.conf
utils-holelogd-linux.patch
+++ /dev/null
---- bind-chroot-8.2.2_P5/src/bin/ndc/pathnames.h.orig Mon Aug 14 05:05:16 2000
-+++ bind-chroot-8.2.2_P5/src/bin/ndc/pathnames.h Mon Aug 14 05:30:49 2000
-@@ -21,54 +21,58 @@
-
- #include <paths.h>
-
-+#ifndef _CHROOTDIR
-+#define _CHROOTDIR "/var/lib/named/chroot"
-+#endif
-+
- #ifndef _PATH_CONF
- #define _PATH_CONF "/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
--#define _PATH_NDCSOCK "/var/run/ndc"
-+#define _PATH_NDCSOCK _CHROOTDIR "/var/run/ndc"
- #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
+++ /dev/null
---- 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);
+++ /dev/null
---- bind-8.2/src/port/linux/include/port_after.h~ Sat Feb 27 02:04:21 1999
-+++ bind-8.2/src/port/linux/include/port_after.h Tue Mar 16 19:30:14 1999
-@@ -63,24 +63,4 @@
- #define PF_INET6 AF_INET6
- #endif
-
--#ifndef HAS_INET6_STRUCTS
--/* Replace with structure from later rev of O/S if known. */
--struct in6_addr {
-- u_int8_t s6_addr[16];
--};
--
--/* Replace with structure from later rev of O/S if known. */
--struct sockaddr_in6 {
--#ifdef HAVE_SA_LEN
-- u_int8_t sin6_len; /* length of this struct */
-- u_int8_t sin6_family; /* AF_INET6 */
--#else
-- u_int16_t sin6_family; /* AF_INET6 */
--#endif
-- u_int16_t sin6_port; /* transport layer port # */
-- u_int32_t sin6_flowinfo; /* IPv6 flow information */
-- struct in6_addr sin6_addr; /* IPv6 address */
-- u_int32_t sin6_scope_id; /* set of interfaces for a scope */
--};
--#endif /* HAS_INET6_STRUCTS */
- #endif /* ! PORT_AFTER_H */
+++ /dev/null
-diff -ruN src.orig/bin/host/host.c src/bin/host/host.c
---- src.orig/bin/host/host.c Thu Nov 11 20:39:10 1999
-+++ src/bin/host/host.c Thu Nov 25 23:07:46 1999
-@@ -270,7 +270,7 @@
- /*NOTREACHED*/
- }
- }
-- if (gettype == 0) {
-+ if (gettype == 0 && (sigchase)) {
- if (verbose)
- printf ("Forcing `-t a' for signature trace.\n");
- gettype = ns_t_a;
+++ /dev/null
---- 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;
+++ /dev/null
-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 .
+++ /dev/null
---- 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>
+++ /dev/null
-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);
+++ /dev/null
-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
-
+++ /dev/null
---- 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
+++ /dev/null
---- 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
+++ /dev/null
---- bind-8.2.2_P5/src/bin/named/db_load.c.ttl Mon Feb 28 00:47:21 2000
-+++ bind-8.2.2_P5/src/bin/named/db_load.c Mon Feb 28 00:50:13 2000
-@@ -292,6 +292,7 @@
- default_warn = 1;
- clev = nlabels(in_origin);
- filenames = NULL;
-+ zp->z_minimum = USE_MINIMUM;
- }
- ttl = default_ttl;
-
-@@ -742,7 +743,7 @@
- zp->z_minimum = 0;
- } else
- zp->z_minimum = n;
-- if (default_ttl == USE_MINIMUM)
-+ if (ttl == USE_MINIMUM)
- ttl = n;
- n = cp - (char *)data;
- if (multiline) {
-@@ -750,6 +751,7 @@
- buf[1] = '\0';
- if (buf[0] != ')')
- ERRTO("SOA \")\"");
-+ multiline = 0;
- endline(fp);
- }
- read_soa++;
-@@ -971,11 +973,14 @@
- case ns_t_cert:
- case ns_t_sig: {
- char *errmsg = NULL;
-- int ret = parse_sec_rdata(buf, sizeof(buf), 0,
-- data, sizeof(data),
-- fp, zp, domain, ttl,
-- type, domain_ctx,
-- transport, &errmsg);
-+ int ret;
-+ if (ttl == USE_MINIMUM) /* no ttl set */
-+ ttl = 0;
-+ ret = parse_sec_rdata(buf, sizeof(buf), 0,
-+ data, sizeof(data),
-+ fp, zp, domain, ttl,
-+ type, domain_ctx,
-+ transport, &errmsg);
- if (ret < 0) {
- errtype = errmsg;
- goto err;
-@@ -1022,6 +1027,8 @@
- zp->z_origin);
- continue;
- }
-+ if (ttl == USE_MINIMUM) /* no ttl set */
-+ ttl = 0;
- dp = savedata(class, type, (u_int32_t)ttl,
- (u_char *)data, (int)n);
- dp->d_zone = zp - zones;
+++ /dev/null
-#!/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_no "${NETWORKING}"; then
- msg_Network_Down "Named"
- exit 1
-fi
-
-# Sanity check
-[ -f /etc/named.conf ] || exit 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"
- exit 1
- 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"
- exit 1
- fi
- ;;
- status)
- /usr/sbin/ndc.chroot status
- exit $?
- ;;
- reload)
- if [ -f /var/lock/subsys/named ]; then
- msg_reloading "Named"
- killproc named -HUP
- else
- msg_Not_Running "Named"
- exit 1
- fi
-
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- msg_Usage "$0 {start|stop|status|reload|restart}"
- exit 1
-esac
-
-exit $RETVAL
+++ /dev/null
-// 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.org.pl" IN {
-// type slave;
-// file "S/pld.org.pl.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; };
-};
-
+++ /dev/null
---- 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);