Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > fc4f4d32ce4b1a90e7e68ed631842990 > files > 9

bind-9.3.6-25.P1.el5_11.9.src.rpm

diff -up bind-9.3.6-P1/bin/named_sdb/main.c.sdb_dbus bind-9.3.6-P1/bin/named_sdb/main.c
--- bind-9.3.6-P1/bin/named_sdb/main.c.sdb_dbus	2009-02-23 14:38:47.000000000 +0100
+++ bind-9.3.6-P1/bin/named_sdb/main.c	2009-02-23 14:40:53.000000000 +0100
@@ -244,7 +244,8 @@ usage(void) {
 		"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}]\n");
+		"             [-m {usage|trace|record}]\n"
+	        "             [-D ]\n");
 }
 
 static void
@@ -351,7 +352,7 @@ parse_command_line(int argc, char *argv[
 	isc_commandline_errprint = ISC_FALSE;
 	while ((ch = isc_commandline_parse(argc, argv,
 					   "46c:C:d:fgi:lm:n:N:p:P:"
-					   "sS:t:u:vx:")) != -1) {
+					   "sS:t:u:vx:D")) != -1) {
 		switch (ch) {
 		case '4':
 			if (disable4)
@@ -444,6 +445,9 @@ parse_command_line(int argc, char *argv[
 		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'",
diff -up bind-9.3.6-P1/bin/named_sdb/Makefile.in.sdb_dbus bind-9.3.6-P1/bin/named_sdb/Makefile.in
--- bind-9.3.6-P1/bin/named_sdb/Makefile.in.sdb_dbus	2009-02-23 14:38:47.000000000 +0100
+++ bind-9.3.6-P1/bin/named_sdb/Makefile.in	2009-02-23 14:38:47.000000000 +0100
@@ -35,7 +35,8 @@ CINCLUDES =	-I${srcdir}/include -I${srcd
 		${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \
 		${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \
 		${DBDRIVER_INCLUDES}
-
+DBUS_INCLUDES = \
+	-I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0
 CDEFINES =
 CWARNINGS =
 
@@ -52,6 +53,7 @@ ISCCCDEPLIBS =	../../lib/isccc/libisccc.
 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}
@@ -70,7 +72,8 @@ OBJS =		aclconf.o builtin.o client.o con
 		tkeyconf.o tsigconf.o update.o xfrout.o \
 		zoneconf.o \
 		lwaddr.o lwresd.o lwdclient.o lwderror.o lwdgabn.o \
-		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o \
+		lwdgnba.o lwdgrbn.o lwdnoop.o lwsearch.o  \
+		dbus_service.o dbus_mgr.o \
 		$(DBDRIVER_OBJS)
 
 UOBJS =		unix/os.o
@@ -83,6 +86,7 @@ SRCS =		aclconf.c builtin.c client.c con
 		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 \
 		$(DBDRIVER_SRCS)
 
 MANPAGES =	named.8 lwresd.8 named.conf.5
@@ -111,9 +115,14 @@ config.o: config.c
 		-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}