PR#221: Fix building against bind 9.18.13 - bind-dyndb-ldap

bind-dyndb-ldap

#221 Fix building against bind 9.18.13

Merged a year ago by abbra. Opened a year ago by tjaalton.

tjaalton/bind-dyndb-ldap for-upstream into master

Timo Aaltonen • a year ago

5f37344

configure.ac

file modified

		`@@ -160,6 +160,14 @@`
		`[AC_MSG_ERROR([Cross compiling is not supported.])]`
		`)`

		`+ # Check db_registered`
		`+ AC_CHECK_HEADER(dns/rpz.h, [], [AC_MSG_ERROR([dns/rpz.h not found])])`
		`+ AC_CHECK_MEMBER([struct dns_rpz_zone.db_registered],`
		`+ [AC_DEFINE([HAVE_DB_REGISTERED], [1],`
		`+ [Struct dns_rpz_zone has db_registered])],`
		`+ [AC_MSG_NOTICE([Struct dns_rpz_zone has no db_registered])],`
		`+ [[#include <dns/rpz.h>]])`
		`+`
		`dnl dns_db_setservestalettl() can be backported, detect support`
		`AC_CHECK_LIB([dns], [dns_db_setservestalettl],`
		`[AC_DEFINE([HAVE_DNS_SERVESTALE], 1, [Define if dns library provides dns_db_setservestalettl])]`

src/ldap_driver.c

file modified

		`@@ -814,7 +814,9 @@`

		`REQUIRE(VALID_LDAPDB(ldapdb));`

		`+ #if defined(HAVE_DB_REGISTERED)`
		`rpzs->zones[rpz_num]->db_registered = true;`
		`+ #endif`
		`result = dns_db_updatenotify_register(ldapdb->rbtdb,`
		`dns_rpz_dbupdate_callback,`
		`rpzs->zones[rpz_num]);`

tjaalton commented a year ago

db_registered got dropped from dns_rpc_zone.

Signed-off-by: Timo Aaltonen tjaalton@debian.org

pemensik commented a year ago

seems good to me, yes.

tjaalton commented a year ago

this is actually still buggy :)

The check doesn't work for some reason, and it doesn't even mark 9.18.12 as having db_registered

rebased onto 5f37344

a year ago

tjaalton commented a year ago

ok fixed now after ab pointed out it had a typo

Pull-Request has been merged by abbra

a year ago

abbra commented a year ago

Merged, thank you.

pemensik commented a year ago

I were trying to find what function it had before, but I haven't found any. It seems to be at least for BIND 9.16.x and 9.18.x we could just remove reference to db_registered parameter. The only actually used member of that name is in lib/dns/catz.c, but that has its own member. It does not exist in 9.11.36 at all. In other versions it is just initialized once, then never changed. It seems to me we could just remove it without conditionals.

tjaalton commented a year ago

that's even better :)