#177 Compile with latest 9.11 released version
Merged 2 years ago by abbra. Opened 2 years ago by pemensik.
pemensik/bind-dyndb-ldap master  into  master

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

  

  #include "config.h"

  

+ #include <isc/util.h>

  #include <isccfg/grammar.h>

  #include <isccfg/namedconf.h>

  

file modified
+2
@@ -6,6 +6,8 @@ 

  

  #include "config.h"

  

+ #include <isc/boolean.h>

+ 

  #include <isccfg/grammar.h>

  

  #include <dns/forward.h>

file modified
+1
@@ -3,6 +3,7 @@ 

   */

  

  #include <isc/rwlock.h>

+ #include <isc/util.h>

  #include <dns/name.h>

  

  #include "rbt_helper.h"

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

  #include <dns/ttl.h>

  #include <dns/types.h>

  

+ #include <isc/int.h>

  #include <isc/region.h>

  #include <isc/types.h>

  #include <isc/util.h>

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

  #define _LD_LDAP_ENTRY_H_

  

  #include <isc/lex.h>

- #include <isc/util.h>

  #include <dns/types.h>

  

  #include "fwd_register.h"
@@ -19,15 +18,15 @@ 

  

  /* Represents values associated with LDAP attribute */

  typedef struct ldap_value ldap_value_t;

- typedef LIST(ldap_value_t) ldap_valuelist_t;

+ typedef ISC_LIST(ldap_value_t) ldap_valuelist_t;

  struct ldap_value {

          char                    *value;

-         LINK(ldap_value_t)      link;

+         ISC_LINK(ldap_value_t)      link;

  };

  

  /* Represents LDAP attribute and it's values */

  typedef struct ldap_attribute	ldap_attribute_t;

- typedef LIST(ldap_attribute_t)	ldap_attributelist_t;

+ typedef ISC_LIST(ldap_attribute_t)	ldap_attributelist_t;

  

  /* Represents LDAP entry and it's attributes */

  typedef unsigned char		ldap_entryclass_t;
@@ -41,7 +40,7 @@ 

  

  	ldap_attribute_t	*lastattr;

  	ldap_attributelist_t	attrs;

- 	LINK(ldap_entry_t)	link;

+ 	ISC_LINK(ldap_entry_t)	link;

  

  	/* Parsing. */

  	isc_lex_t		*lex;
@@ -59,7 +58,7 @@ 

  	char			**ldap_values;

  	ldap_value_t		*lastval;

  	ldap_valuelist_t	values;

- 	LINK(ldap_attribute_t)	link;

+ 	ISC_LINK(ldap_attribute_t)	link;

  };

  

  #define LDAP_ENTRYCLASS_NONE	0x0

file modified
+2 -2
@@ -26,6 +26,7 @@ 

  

  #include <isc/buffer.h>

  #include <isc/dir.h>

+ #include <isc/int.h>

  #include <isc/mem.h>

  #include <isc/mutex.h>

  #include <isc/region.h>
@@ -4101,7 +4102,6 @@ 

  	ldap_entry_t *entry = NULL;

  	dns_name_t *zone_name = NULL;

  	dns_zone_t *zone_ptr = NULL;

- 	char *dn = NULL;

  	isc_taskaction_t action = NULL;

  	isc_task_t *task = NULL;

  	isc_boolean_t synchronous;
@@ -4155,7 +4155,7 @@ 

  	else if ((entry->class & LDAP_ENTRYCLASS_RR) != 0)

  		action = update_record;

  	else {

- 		log_error("unsupported objectClass: dn '%s'", dn);

+ 		log_error("unsupported objectClass: dn '%s'", entry->dn);

  		result = ISC_R_NOTIMPLEMENTED;

  		goto cleanup;

  	}

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

  

  #include "types.h"

  

+ #include <isc/boolean.h>

  #include <isc/eventclass.h>

  #include <isc/util.h>

  #include <isccfg/cfg.h>

file modified
+3 -2
@@ -10,6 +10,7 @@ 

  #include <uuid/uuid.h>

  

  #include <isc/boolean.h>

+ #include <isc/int.h>

  #include <isc/net.h>

  #include <isc/refcount.h>

  #include <isc/result.h>
@@ -119,13 +120,13 @@ 

   * reference counter value.

   */

  STATIC_ASSERT((isc_uint32_t)

- 		(typeof(isc_refcount_current((isc_refcount_t *)0)))

+ 		(typeof(((isc_refcount_t *)0)->refs))

  		-1

  	      == 0xFFFFFFFF, \

  	      "negative isc_refcount_t cannot be properly shortened to 32 bits");

  

  STATIC_ASSERT((isc_uint32_t)

- 		(typeof(isc_refcount_current((isc_refcount_t *)0)))

+ 		(typeof(((isc_refcount_t *)0)->refs))

  		0x90ABCDEF12345678

  	      == 0x12345678, \

  	      "positive isc_refcount_t cannot be properly shortened to 32 bits");

file modified
+1
@@ -2,6 +2,7 @@ 

   * Copyright (C) 2013-2014  bind-dyndb-ldap authors; see COPYING for license

   */

  

+ #include <isc/util.h>

  #include <dns/rbt.h>

  

  #include "util.h"

file modified
+2
@@ -6,6 +6,8 @@ 

  #define _LD_SETTINGS_H_

  

  #include <isc/types.h>

+ #include <isc/boolean.h>

+ #include <isc/int.h>

  

  #include <isccfg/grammar.h>

  

file modified
+3 -1
@@ -5,7 +5,9 @@ 

  #ifndef _LD_TYPES_H_

  #define _LD_TYPES_H_

  

+ #include <isc/boolean.h>

  #include <isc/event.h>

+ #include <isc/int.h>

  #include <isc/refcount.h>

  #include <dns/name.h>

  
@@ -24,7 +26,7 @@ 

   * rdata1 -> rdata2 -> rdata3           rdata4 -> rdata5

   * next_rdatalist              ->       next_rdatalist  ...

   */

- typedef LIST(dns_rdatalist_t) ldapdb_rdatalist_t;

+ typedef ISC_LIST(dns_rdatalist_t) ldapdb_rdatalist_t;

  

  typedef struct enum_txt_assoc {

  	int		value;

file modified
+1
@@ -2,6 +2,7 @@ 

   * Copyright (C) 2014-2015  bind-dyndb-ldap authors; see COPYING for license

   */

  

+ #include <isc/int.h>

  #include <isc/types.h>

  #include <isc/util.h>

  

ISC replaced custom definitions of internal integer and boolean types with standard types. They also require generic macros to use ISC_ prefix with external code. Add required includes for backward compatibility.

Related to issue #176

Pull-Request has been merged by abbra

2 years ago