jvdias 70e5bc
--- bind-9.3.1/bin/named_sdb/Makefile.in.sdb_dbus	2005-08-16 21:18:06.000000000 -0400
jvdias 70e5bc
+++ bind-9.3.1/bin/named_sdb/Makefile.in	2005-08-16 21:18:06.000000000 -0400
jvdias 70e5bc
@@ -35,7 +35,8 @@
jvdias 70e5bc
 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
jvdias 70e5bc
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
jvdias 70e5bc
 		${DBDRIVER_INCLUDES}
jvdias 70e5bc
-
jvdias 70e5bc
+DBUS_INCLUDES = \
jvdias 70e5bc
+	-I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0
jvdias 70e5bc
 CDEFINES =
jvdias 70e5bc
 CWARNINGS =
jvdias 70e5bc
 
jvdias 70e5bc
@@ -52,6 +53,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}
jvdias 70e5bc
@@ -70,7 +72,8 @@
jvdias 70e5bc
 		tkeyconf.o tsigconf.o update.o xfrout.o \
jvdias 70e5bc
 		zoneconf.o \
jvdias 70e5bc
 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
jvdias 70e5bc
-		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
jvdias 70e5bc
+		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o  \
jvdias 70e5bc
+		dbus_service.o dbus_mgr.o \
jvdias 70e5bc
 		$(DBDRIVER_OBJS)
jvdias 70e5bc
 
jvdias 70e5bc
 UOBJS =		unix/os.o
jvdias 70e5bc
@@ -83,6 +86,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 \
jvdias 70e5bc
+	        dbus_service.c dbus_mgr.c \
jvdias 70e5bc
 		$(DBDRIVER_SRCS)
jvdias 70e5bc
 
jvdias 70e5bc
 MANPAGES =	named.8 lwresd.8 named.conf.5
jvdias 70e5bc
@@ -114,9 +118,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
 
jvdias 70e5bc
--- bind-9.3.1/bin/named_sdb/main.c.sdb_dbus	2005-08-16 21:18:06.000000000 -0400
jvdias 70e5bc
+++ bind-9.3.1/bin/named_sdb/main.c	2005-08-16 21:21:40.000000000 -0400
jvdias 70e5bc
@@ -243,7 +243,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"
jvdias 70e5bc
-		"             [-m {usage|trace|record}]\n");
jvdias 70e5bc
+		"             [-m {usage|trace|record}]\n"
jvdias 70e5bc
+	        "             [-D ]\n");
jvdias 70e5bc
 }
jvdias 70e5bc
 
jvdias 70e5bc
 static void
jvdias 70e5bc
@@ -349,7 +350,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)
jvdias 70e5bc
@@ -438,6 +439,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'",