--- hier.c.dist	Wed Jan 29 15:08:03 2003
+++ hier.c	Wed Jan 29 15:10:31 2003
@@ -2,7 +2,7 @@
 
 void hier()
 {
-  c("/","etc","dnsroots.global",-1,-1,0644);
+  c(auto_home,"etc/djbdns","dnsroots.global",-1,-1,0644);
 
   h(auto_home,-1,-1,02755);
   d(auto_home,"bin",-1,-1,02755);
--- axfrdns-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ axfrdns-conf.c	Wed Jan 29 15:06:38 2003
@@ -51,7 +51,7 @@
   start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec envdir ./env sh -c '\n  exec envuidgid "); outs(user);
   outs(" softlimit -d300000 tcpserver -vDRHl0 -x tcp.cdb -- \"$IP\" 53 ");
-  outs(auto_home); outs("/bin/axfrdns\n'\n");
+  outs(auto_home); outs("/libexec/djbdns/bin/axfrdns\n'\n");
   finish();
   perm(0755);
 
--- rbldns-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ rbldns-conf.c	Wed Jan 29 15:07:02 2003
@@ -52,7 +52,7 @@
   start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
   outs(" envdir ./env softlimit -d250000 ");
-  outs(auto_home); outs("/bin/rbldns\n");
+  outs(auto_home); outs("/libexec/djbdns/bin/rbldns\n");
   finish();
   perm(0755);
 
--- walldns-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ walldns-conf.c	Wed Jan 29 15:07:20 2003
@@ -47,7 +47,7 @@
   start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
   outs(" envdir ./env softlimit -d250000 ");
-  outs(auto_home); outs("/bin/walldns\n");
+  outs(auto_home); outs("/libexec/djbdns/bin/walldns\n");
   finish();
   perm(0755);
 
--- dnscache-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ dnscache-conf.c	Wed Jan 29 15:10:17 2003
@@ -89,13 +89,13 @@
   if (chdir(auto_home) == -1)
     strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
 
-  fdrootservers = open_read("/etc/dnsroots.local");
+  fdrootservers = open_read("etc/djbdns/dnsroots.local");
   if (fdrootservers == -1) {
     if (errno != error_noent)
-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
-    fdrootservers = open_read("/etc/dnsroots.global");
+      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/djbdns/dnsroots.local: ");
+    fdrootservers = open_read("etc/djbdns/dnsroots.global");
     if (fdrootservers == -1)
-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
+      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/djbdns/dnsroots.global: ");
   }
 
   init(dir,FATAL);
@@ -123,7 +123,7 @@
   seed_addtime(); start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec <seed\nexec envdir ./env sh -c '\n  exec envuidgid "); outs(user);
   outs(" softlimit -o250 -d \"$DATALIMIT\" ");
-  outs(auto_home); outs("/bin/dnscache\n'\n"); finish();
+  outs(auto_home); outs("/libexec/djbdns/bin/dnscache\n'\n"); finish();
   seed_addtime(); perm(0755);
   seed_addtime(); start("log/run");
   outs("#!/bin/sh\nexec setuidgid "); outs(loguser);
--- pickdns-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ pickdns-conf.c	Wed Jan 29 15:06:51 2003
@@ -47,7 +47,7 @@
   start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
   outs(" envdir ./env softlimit -d250000 ");
-  outs(auto_home); outs("/bin/pickdns\n");
+  outs(auto_home); outs("/libexec/djbdns/bin/pickdns\n");
   finish();
   perm(0755);
 
--- tinydns-conf.c.dist	Wed Jan 29 15:06:10 2003
+++ tinydns-conf.c	Wed Jan 29 15:07:16 2003
@@ -47,7 +47,7 @@
   start("run");
   outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
   outs(" envdir ./env softlimit -d300000 ");
-  outs(auto_home); outs("/bin/tinydns\n");
+  outs(auto_home); outs("/libexec/djbdns/bin/tinydns\n");
   finish();
   perm(0755);
 
--- error.h.dist	2003-08-08 13:49:52.000000000 +0200
+++ error.h	2003-08-08 13:49:58.000000000 +0200
@@ -1,7 +1,7 @@
 #ifndef ERROR_H
 #define ERROR_H
 
-extern int errno;
+#include <errno.h>
 
 extern int error_intr;
 extern int error_nomem;