Adam Tkac 5ea70d
--- bind-9.4.0/bin/named_sdb/Makefile.in.sdb_dbus	2007-03-06 14:12:30.000000000 +0100
Adam Tkac 5ea70d
+++ bind-9.4.0/bin/named_sdb/Makefile.in	2007-03-06 14:16:45.000000000 +0100
Adam Tkac 5ea70d
@@ -43,6 +43,9 @@
jvdias 70e5bc
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
Adam Tkac 5ea70d
 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}
Adam Tkac 5ea70d
 
jvdias 70e5bc
+DBUS_INCLUDES = \
Adam Tkac 5ea70d
+        -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0
Adam Tkac 5ea70d
+
Adam Tkac 5ea70d
 CDEFINES =      @USE_DLZ@
jvdias 70e5bc
 
Adam Tkac 5ea70d
 CWARNINGS =
Adam Tkac 5ea70d
@@ -60,6 +63,7 @@
jvdias 70e5bc
 ISCDEPLIBS =	../../lib/isc/libisc.@A@
jvdias 70e5bc
 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@
jvdias 70e5bc
 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@
jvdias 70e5bc
+DBUSLIBS=       -ldbus-1
jvdias 70e5bc
 
jvdias 70e5bc
 DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \
jvdias 70e5bc
 		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}
Adam Tkac 5ea70d
@@ -80,6 +84,7 @@
jvdias 70e5bc
 		zoneconf.o \
jvdias 70e5bc
 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
Adam Tkac 5ea70d
 		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
jvdias 70e5bc
+		dbus_service.o dbus_mgr.o \
Adam Tkac 5ea70d
 		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}
jvdias 70e5bc
 
jvdias 70e5bc
 UOBJS =		unix/os.o
Adam Tkac 5ea70d
@@ -92,6 +97,7 @@
jvdias 70e5bc
 		zoneconf.c \
jvdias 70e5bc
 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \
jvdias 70e5bc
 		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \
Adam Tkac 5ea70d
+		dbus_service.c dbus_mgr.c \
Adam Tkac 5ea70d
 		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}
jvdias 70e5bc
 
jvdias 70e5bc
 MANPAGES =	named.8 lwresd.8 named.conf.5
Adam Tkac 5ea70d
@@ -120,9 +126,14 @@
jvdias 70e5bc
 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \
jvdias 70e5bc
 		-c ${srcdir}/config.c
jvdias 70e5bc
 
jvdias 70e5bc
+dbus_service.o: dbus_service.c
jvdias 70e5bc
+	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \
jvdias 70e5bc
+	        ${DBUS_INCLUDES} \
jvdias 70e5bc
+		-c ${srcdir}/dbus_service.c
jvdias 70e5bc
+
jvdias 70e5bc
 named_sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}
jvdias 70e5bc
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
jvdias 70e5bc
-	${OBJS} ${UOBJS} ${LIBS}
jvdias 70e5bc
+	${OBJS} ${UOBJS} ${LIBS} ${DBUSLIBS}
jvdias 70e5bc
 
jvdias 70e5bc
 doc man:: ${MANOBJS}
jvdias 70e5bc
 
Adam Tkac 5ea70d
--- bind-9.4.0/bin/named_sdb/main.c.sdb_dbus	2007-03-06 14:12:30.000000000 +0100
Adam Tkac 5ea70d
+++ bind-9.4.0/bin/named_sdb/main.c	2007-03-06 14:17:51.000000000 +0100
Adam Tkac 5ea70d
@@ -251,7 +251,8 @@
jvdias 70e5bc
 		"usage: named [-4|-6] [-c conffile] [-d debuglevel] "
jvdias 70e5bc
 		"[-f|-g] [-n number_of_cpus]\n"
jvdias 70e5bc
 		"             [-p port] [-s] [-t chrootdir] [-u username]\n"
Adam Tkac 5ea70d
-		"             [-m {usage|trace|record|size|mctx}]\n");
Adam Tkac 5ea70d
+		"             [-m {usage|trace|record|size|mctx}]\n"
Adam Tkac 5ea70d
+		"	      [-D ]\n");
jvdias 70e5bc
 }
jvdias 70e5bc
 
jvdias 70e5bc
 static void
Adam Tkac 5ea70d
@@ -359,7 +360,7 @@
jvdias 70e5bc
 
jvdias 70e5bc
 	isc_commandline_errprint = ISC_FALSE;
jvdias 70e5bc
 	while ((ch = isc_commandline_parse(argc, argv,
jvdias 70e5bc
-			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:")) != -1) {
jvdias 70e5bc
+			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:D")) != -1) {
jvdias 70e5bc
 		switch (ch) {
jvdias 70e5bc
 		case '4':
jvdias 70e5bc
 			if (disable4)
Adam Tkac 5ea70d
@@ -448,6 +449,9 @@
jvdias 70e5bc
 		case 'v':
jvdias 70e5bc
 			printf("BIND %s\n", ns_g_version);
jvdias 70e5bc
 			exit(0);
jvdias 70e5bc
+		case 'D':
jvdias 70e5bc
+		        ns_g_dbus = 1;
jvdias 70e5bc
+			break;
jvdias 70e5bc
 		case '?':
jvdias 70e5bc
 			usage();
jvdias 70e5bc
 			ns_main_earlyfatal("unknown option '-%c'",