Attachment #662761 for bug #699290




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

bld.SAMBA_LIBRARY('dlz_bind9_16',
                  source='dlz_bind9.c',
                  cflags='-DBIND_VERSION_9_16',
                  private_library=True,
                  link_name='modules/bind9/dlz_bind9_16.so',
                  realname='dlz_bind9_16.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 (+3 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.16.x
		29	${BIND9_16} database "dlopen ${MODULESDIR}/bind9/dlz_bind9_16.so";
27	};	30	};
28		31

Lines 37-42 Link Here

(-)a/source4/dns_server/dlz_minimal.h_orig (-2 / +9 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_16)
		41	# define DLZ_DLOPEN_VERSION 3
		42	# define DNS_CLIENTINFO_VERSION 2
40	#else	43	#else
41	# error Unsupported BIND version	44	# error Unsupported BIND version
42	#endif	45	#endif
43	-- a/python/samba/provision/sambadns.py_orig 2019-10-30 19:29:40.795532004 +0100	46	++ b/python/samba/provision/sambadns.py 2019-10-30 19:33:03.162076711 +0100
Lines 960-965 Link Here
960	bind9_10 = '#'	960	bind9_10 = '#'
961	bind9_11 = '#'	961	bind9_11 = '#'
962	bind9_12 = '#'	962	bind9_12 = '#'
		963	bind9_16 = '#'
963	if bind_info.upper().find('BIND 9.8') != -1:	964	if bind_info.upper().find('BIND 9.8') != -1:
964	bind9_8 = ''	965	bind9_8 = ''
965	elif bind_info.upper().find('BIND 9.9') != -1:	966	elif bind_info.upper().find('BIND 9.9') != -1:
Lines 970-975 Link Here
970	bind9_11 = ''	971	bind9_11 = ''
971	elif bind_info.upper().find('BIND 9.12') != -1:	972	elif bind_info.upper().find('BIND 9.12') != -1:
972	bind9_12 = ''	973	bind9_12 = ''
		974	elif bind_info.upper().find('BIND 9.16') != -1:
		975	bind9_16 = ''
973	elif bind_info.upper().find('BIND 9.7') != -1:	976	elif bind_info.upper().find('BIND 9.7') != -1:
974	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")	977	raise ProvisioningError("DLZ option incompatible with BIND 9.7.")
975	else:	978	else:
Lines 981-987 Link Here
981	"BIND9_9": bind9_9,	984	"BIND9_9": bind9_9,
982	"BIND9_10": bind9_10,	985	"BIND9_10": bind9_10,
983	"BIND9_11": bind9_11,	986	"BIND9_11": bind9_11,
984	"BIND9_12": bind9_12	987	"BIND9_12": bind9_12,
		988	"BIND9_16": bind9_16
985		989
986	})	990	})

Return to bug 699290

Lines 68-73 Link Here

(-)a/source4/dns_server/wscript_build_orig (+10 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_16',
		72	source='dlz_bind9.c',
		73	cflags='-DBIND_VERSION_9_16',
		74	private_library=True,
		75	link_name='modules/bind9/dlz_bind9_16.so',
		76	realname='dlz_bind9_16.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
71	bld.SAMBA_LIBRARY('dlz_bind9_for_torture',	81	bld.SAMBA_LIBRARY('dlz_bind9_for_torture',
72	source='dlz_bind9.c',	82	source='dlz_bind9.c',
73	cflags='-DBIND_VERSION_9_8',	83	cflags='-DBIND_VERSION_9_8',