--- bind-9.4.0/bin/named_sdb/Makefile.in.sdb_dbus	2007-03-06 14:12:30.000000000 +0100

+++ bind-9.4.0/bin/named_sdb/Makefile.in	2007-03-06 14:16:45.000000000 +0100

@@ -43,6 +43,9 @@

 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \

 		${DLZDRIVER_INCLUDES} ${DBDRIVER_INCLUDES}

+DBUS_INCLUDES = \

+        -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0

+

 CDEFINES =      @USE_DLZ@

 CWARNINGS =

@@ -60,6 +63,7 @@

 ISCDEPLIBS =	../../lib/isc/libisc.@A@

 LWRESDEPLIBS =	../../lib/lwres/liblwres.@A@

 BIND9DEPLIBS =	../../lib/bind9/libbind9.@A@

+DBUSLIBS=       -ldbus-1

 DEPLIBS =	${LWRESDEPLIBS} ${DNSDEPLIBS} ${BIND9DEPLIBS} \

 		${ISCCFGDEPLIBS} ${ISCCCDEPLIBS} ${ISCDEPLIBS}

@@ -80,6 +84,7 @@

 		zoneconf.o \

 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \

 		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \

+		dbus_service.o dbus_mgr.o \

 		${DLZDRIVER_OBJS} ${DBDRIVER_OBJS}

 UOBJS =		unix/os.o

@@ -92,6 +97,7 @@

 		zoneconf.c \

 		lwaddr.c lwresd.c lwdclient.c lwderror.c lwdgabn.c \

 		lwdgnba.c lwdgrbn.c lwdnoop.c lwsearch.c \

+		dbus_service.c dbus_mgr.c \

 		${DLZDRIVER_SRCS} ${DBDRIVER_SRCS}

 MANPAGES =	named.8 lwresd.8 named.conf.5

@@ -120,9 +126,14 @@

 		-DNS_LOCALSTATEDIR=\"${localstatedir}\" \

 		-c ${srcdir}/config.c

+dbus_service.o: dbus_service.c

+	${LIBTOOL_MODE_COMPILE} ${CC} ${ALL_CFLAGS} \

+	        ${DBUS_INCLUDES} \

+		-c ${srcdir}/dbus_service.c

+

 named_sdb@EXEEXT@: ${OBJS} ${UOBJS} ${DEPLIBS}

 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \

-	${OBJS} ${UOBJS} ${LIBS}

+	${OBJS} ${UOBJS} ${LIBS} ${DBUSLIBS}

 doc man:: ${MANOBJS}

--- bind-9.4.0/bin/named_sdb/main.c.sdb_dbus	2007-03-06 14:12:30.000000000 +0100

+++ bind-9.4.0/bin/named_sdb/main.c	2007-03-06 14:17:51.000000000 +0100

@@ -251,7 +251,8 @@

 		"usage: named [-4|-6] [-c conffile] [-d debuglevel] "

 		"[-f|-g] [-n number_of_cpus]\n"

 		"             [-p port] [-s] [-t chrootdir] [-u username]\n"

-		"             [-m {usage|trace|record|size|mctx}]\n");

+		"             [-m {usage|trace|record|size|mctx}]\n"

+		"	      [-D ]\n");

 }

 static void

@@ -359,7 +360,7 @@

 	isc_commandline_errprint = ISC_FALSE;

 	while ((ch = isc_commandline_parse(argc, argv,

-			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:")) != -1) {

+			           "46c:C:d:fgi:lm:n:N:p:P:st:u:vx:D")) != -1) {

 		switch (ch) {

 		case '4':

 			if (disable4)

@@ -448,6 +449,9 @@

 		case 'v':

 			printf("BIND %s\n", ns_g_version);

 			exit(0);

+		case 'D':

+		        ns_g_dbus = 1;

+			break;

 		case '?':

 			usage();

 			ns_main_earlyfatal("unknown option '-%c'",