#206 Compile on BIND 9.16.16
Merged a year ago by abbra. Opened a year ago by pemensik.
pemensik/bind-dyndb-ldap bind-9.16.16-support  into  master

file modified
+1 -1
@@ -1026,7 +1026,7 @@ 

  	ldap_instance_t *ldap_inst = driverarg;

  	zone_register_t *zr = NULL;

  

- 	REQUIRE(ISCAPI_MCTX_VALID(mctx));

+ 	UNUSED(mctx);

  	REQUIRE(type == LDAP_DB_TYPE);

  	REQUIRE(rdclass == LDAP_DB_RDATACLASS);

  	REQUIRE(argc == 0);

file modified
+6 -7
@@ -1135,7 +1135,7 @@ 

   * Add zone to the view defined in inst->view.

   */

  static isc_result_t ATTR_NONNULLS ATTR_CHECKRESULT

- publish_zone(isc_task_t *task, ldap_instance_t *inst, dns_zone_t *zone)

+ publish_zone(ldap_instance_t *inst, dns_zone_t *zone)

  {

  	isc_result_t result;

  	bool freeze = false;
@@ -1143,7 +1143,6 @@ 

  	dns_view_t *view_in_zone = NULL;

  	isc_result_t lock_state = ISC_R_IGNORE;

  

- 	REQUIRE(ISCAPI_TASK_VALID(task));

  	REQUIRE(inst != NULL);

  	REQUIRE(zone != NULL);

  
@@ -1199,7 +1198,7 @@ 

   * Add zone to view and call dns_zone_load().

   */

  static isc_result_t ATTR_NONNULLS ATTR_CHECKRESULT

- activate_zone(isc_task_t *task, ldap_instance_t *inst, dns_name_t *name) {

+ activate_zone(ldap_instance_t *inst, dns_name_t *name) {

  	isc_result_t result;

  	dns_zone_t *raw = NULL;

  	dns_zone_t *secure = NULL;
@@ -1218,7 +1217,7 @@ 

  	 * otherwise it will race with zone->view != NULL check

  	 * in zone_maintenance() in zone.c.

  	 */

- 	result = publish_zone(task, inst, toview);

+ 	result = publish_zone(inst, toview);

  	if (result != ISC_R_SUCCESS) {

  		dns_zone_log(toview, ISC_LOG_ERROR,

  			     "cannot add zone to view: %s",
@@ -1247,7 +1246,7 @@ 

   * and load zones.

   */

  isc_result_t

- activate_zones(isc_task_t *task, ldap_instance_t *inst) {

+ activate_zones(ldap_instance_t *inst) {

  	isc_result_t result;

  	rbt_iterator_t *iter = NULL;

  	DECLARE_BUFFERED_NAME(name);
@@ -1270,7 +1269,7 @@ 

  		++total_cnt;

  		if (active == true) {

  			++active_cnt;

- 			result = activate_zone(task, inst, &name);

+ 			result = activate_zone(inst, &name);

  			if (result == ISC_R_SUCCESS)

  				++published_cnt;

  			result = fwd_configure_zone(settings, inst, &name);
@@ -2243,7 +2242,7 @@ 

  	toview = (want_secure == true) ? secure : raw;

  	if (isactive == true) {

  		if (new_zone == true || activity_changed == true)

- 			CHECK(publish_zone(task, inst, toview));

+ 			CHECK(publish_zone(inst, toview));

  		CHECK(load_zone(toview, false));

  		CHECK(fwd_configure_zone(zone_settings, inst, &entry->fqdn));

  	} else if (activity_changed == true) { /* Zone was deactivated */

file modified
+1 -1
@@ -84,7 +84,7 @@ 

  

  zone_register_t * ldap_instance_getzr(ldap_instance_t *ldap_inst) ATTR_NONNULLS;

  

- isc_result_t activate_zones(isc_task_t *task, ldap_instance_t *inst) ATTR_NONNULLS;

+ isc_result_t activate_zones(ldap_instance_t *inst) ATTR_NONNULLS;

  

  isc_task_t * ldap_instance_gettask(ldap_instance_t *ldap_inst);

  

file modified
+3 -4
@@ -131,8 +131,8 @@ 

  	sync_barrierev_t *bev = NULL;

  	sync_state_t new_state;

  

- 	REQUIRE(ISCAPI_TASK_VALID(task));

  	REQUIRE(event != NULL);

+ 	UNUSED(task);

  

  	bev = (sync_barrierev_t *)event;

  	log_debug(1, "sync_barrier_wait(): finish reached");
@@ -156,7 +156,7 @@ 

  	BROADCAST(&bev->sctx->cond);

  	UNLOCK(&bev->sctx->mutex);

  	if (new_state == sync_finished)

- 		activate_zones(task, bev->inst);

+ 		activate_zones(bev->inst);

  

  	if (result != ISC_R_SUCCESS)

  		log_error_r("syncrepl finish() failed");
@@ -206,8 +206,8 @@ 

  	sync_barrierev_t *bev = NULL;

  	uint32_t cnt;

  

- 	REQUIRE(ISCAPI_TASK_VALID(task));

  	REQUIRE(event != NULL);

+ 	UNUSED(task);

  

  	bev = (sync_barrierev_t *)event;

  #if LIBDNS_VERSION_MAJOR < 1600
@@ -458,7 +458,6 @@ 

  	uint32_t cnt;

  

  	REQUIRE(sctx != NULL);

- 	REQUIRE(ISCAPI_TASK_VALID(task));

  

  	newel = isc_mem_get(sctx->mctx, sizeof(*(newel)));

  	ZERO_PTR(newel);

Do not check validity of ISCAPI pointers, isc_task_t were made private.
Reduce also passing of task pointer where they are never used.

rebased onto 55ea24d

a year ago

Pull-Request has been merged by abbra

a year ago