Attachment #594992 for bug #699290




                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                  enabled=bld.AD_DC_BUILD_IS_ENABLED())

bld.SAMBA_LIBRARY('dlz_bind9_14',
                  source='dlz_bind9.c',
                  cflags='-DBIND_VERSION_9_14',
                  private_library=True,
                  link_name='modules/bind9/dlz_bind9_14.so',
                  realname='dlz_bind9_14.so',
                  install_path='${MODULESDIR}/bind9',
                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                  enabled=bld.AD_DC_BUILD_IS_ENABLED())

bld.SAMBA_LIBRARY('dlz_bind9_15',
                  source='dlz_bind9.c',
                  cflags='-DBIND_VERSION_9_15',
                  private_library=True,
                  link_name='modules/bind9/dlz_bind9_15.so',
                  realname='dlz_bind9_15.so',
                  install_path='${MODULESDIR}/bind9',
                  deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
                  enabled=bld.AD_DC_BUILD_IS_ENABLED())
                  

bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
                  source='dlz_bind9.c',
                  cflags='-DBIND_VERSION_9_8',

Lines 24-28 Link Here

(-)a/source4/setup/named.conf.dlz_orig (+6 lines)
24		24
25	# For BIND 9.12.x	25	# For BIND 9.12.x
26	${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";	26	${BIND9_12} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_12.so";
		27
		28	# For BIND 9.14.x
		29	${BIND9_14} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_14.so";
		30
		31	# For BIND 9.15.x
		32	${BIND9_15} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_15.so";
27	};	33	};
28		34

Lines 37-42 Link Here

(-)a/source4/dns_server/dlz_minimal.hs_orig (+6 lines)
37	#elif defined (BIND_VERSION_9_12)	37	#elif defined (BIND_VERSION_9_12)
38	# define DLZ_DLOPEN_VERSION 3	38	# define DLZ_DLOPEN_VERSION 3
39	# define DNS_CLIENTINFO_VERSION 2	39	# define DNS_CLIENTINFO_VERSION 2
		40	#elif defined (BIND_VERSION_9_14)
		41	# define DLZ_DLOPEN_VERSION 3
		42	# define DNS_CLIENTINFO_VERSION 2
		43	#elif defined (BIND_VERSION_9_15)
		44	# define DLZ_DLOPEN_VERSION 3
		45	# define DNS_CLIENTINFO_VERSION 2
40	#else	46	#else
41	# error Unsupported BIND version	47	# error Unsupported BIND version
42	#endif	48	#endif

Lines 970-975 Link Here

(-)a/python/samba/provision/sambadns.py_orig (-1 / +7 lines)
970	bind9_11 = ''	970	bind9_11 = ''
971	elif bind_info.upper().find('BIND 9.12') != -1:	971	elif bind_info.upper().find('BIND 9.12') != -1:
972	bind9_12 = ''	972	bind9_12 = ''
		973	elif bind_info.upper().find('BIND 9.14') != -1:
		974	bind9_14 = ''
		975	elif bind_info.upper().find('BIND 9.15') != -1:
		976	bind9_15 = ''
973	elif bind_info.upper().find('BIND 9.7') != -1:	977	elif bind_info.upper().find('BIND 9.7') != -1:
974	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")	978	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
975	else:	979	else:
Lines 981-987 Link Here
981	"BIND9_9": bind9_9,	985	"BIND9_9": bind9_9,
982	"BIND9_10": bind9_10,	986	"BIND9_10": bind9_10,
983	"BIND9_11": bind9_11,	987	"BIND9_11": bind9_11,
984	"BIND9_12": bind9_12	988	"BIND9_12": bind9_12,
		989	"BIND9_14": bind9_14,
		990	"BIND9_15": bind9_15
985		991
986	})	992	})
987		993

Return to bug 699290

Lines 68-73 Link Here

(-)a/source4/dns_server/wscript_build_orig (+21 lines)
68	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',	68	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
69	enabled=bld.AD_DC_BUILD_IS_ENABLED())	69	enabled=bld.AD_DC_BUILD_IS_ENABLED())
70		70
		71	bld.SAMBA_LIBRARY('dlz_bind9_14',
		72	source='dlz_bind9.c',
		73	cflags='-DBIND_VERSION_9_14',
		74	private_library=True,
		75	link_name='modules/bind9/dlz_bind9_14.so',
		76	realname='dlz_bind9_14.so',
		77	install_path='${MODULESDIR}/bind9',
		78	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
		79	enabled=bld.AD_DC_BUILD_IS_ENABLED())
		80
		81	bld.SAMBA_LIBRARY('dlz_bind9_15',
		82	source='dlz_bind9.c',
		83	cflags='-DBIND_VERSION_9_15',
		84	private_library=True,
		85	link_name='modules/bind9/dlz_bind9_15.so',
		86	realname='dlz_bind9_15.so',
		87	install_path='${MODULESDIR}/bind9',
		88	deps='samba-hostconfig samdb-common gensec popt dnsserver_common',
		89	enabled=bld.AD_DC_BUILD_IS_ENABLED())
		90
		91
71	bld.SAMBA_LIBRARY('dlz_bind9_for_torture',	92	bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
72	source='dlz_bind9.c',	93	source='dlz_bind9.c',
73	cflags='-DBIND_VERSION_9_8',	94	cflags='-DBIND_VERSION_9_8',