diff -urN thttpd-2.21-7/Makefile.in thttpd-2.21-8/Makefile.in --- thttpd-2.21-7/Makefile.in Thu Nov 22 14:43:09 2001 +++ thttpd-2.21-8/Makefile.in Thu Nov 22 16:04:05 2001 @@ -164,12 +164,12 @@ rm -rf $$name ; \ gzip $$name.tar -thttpd.o: config.h version.h libhttpd.h fdwatch.h mmc.h timers.h match.h vhostconf.h +thttpd.o: config.h version.h libhttpd.h fdwatch.h mmc.h timers.h match.h vhostconf.h machineconf.h libhttpd.o: config.h version.h libhttpd.h mime_encodings.h mime_types.h \ - mmc.h timers.h match.h tdate_parse.h vhostconf.h + mmc.h timers.h match.h tdate_parse.h vhostconf.h machineconf.h fdwatch.o: fdwatch.h mmc.o: mmc.h timers.o: timers.h match.o: match.h tdate_parse.o: tdate_parse.h -vhost.o: vhostconf.h +vhost.o: vhostconf.h machineconf.h diff -urN thttpd-2.21-7/machineconf.h thttpd-2.21-8/machineconf.h --- thttpd-2.21-7/machineconf.h Thu Jan 1 02:00:00 1970 +++ thttpd-2.21-8/machineconf.h Thu Nov 22 16:04:05 2001 @@ -0,0 +1,6 @@ +#define DBHOST "localhost" +#define DBNAME "test0" +#define DBUSER "root" +#define DBPASS "" +#define UDSPATH "/tmp/testsock" +#define BANNER_BASE "/home/banners" diff -urN thttpd-2.21-7/vhostconf.h thttpd-2.21-8/vhostconf.h --- thttpd-2.21-7/vhostconf.h Thu Nov 22 14:43:09 2001 +++ thttpd-2.21-8/vhostconf.h Thu Nov 22 16:04:05 2001 @@ -1,18 +1,10 @@ -#define DBHOST "localhost" -#define DBNAME "test0" -#define DBUSER "root" -#define DBPASS "" -#define UDSPATH "/tmp/testsock" -#define BANNER_BASE "/home/banners" - +#include "machineconf.h" /* Please, god,root, let mysql sort the results like strcmp.... */ #define QUERY "select hostname,path,advtype from vhost order by hostname" #define QUERY_BAN "select advtype,num from numban" #define QUERY_RDR "select umatch, url from redir where type='referer' order by umatch" #include - - /* Vhost list struct