#229 use BIND macros when defining DNS names
Merged 3 months ago by abbra. Opened 3 months ago by abbra.
abbra/bind-dyndb-ldap bind-CVE-2023-4408-fixes  into  master

file modified
+1 -12
@@ -50,18 +50,7 @@ 

  static unsigned char uuid_rootname_ndata[]

  	= { 4, 'u', 'u', 'i', 'd', 4, 'l', 'd', 'a', 'p', 0 };

  static unsigned char uuid_rootname_offsets[] = { 0, 5, 10 };

- static dns_name_t uuid_rootname =

- {

- 	DNS_NAME_MAGIC,

- 	uuid_rootname_ndata,

- 	sizeof(uuid_rootname_ndata),

- 	sizeof(uuid_rootname_offsets),

- 	DNS_NAMEATTR_READONLY | DNS_NAMEATTR_ABSOLUTE,

- 	uuid_rootname_offsets,

- 	NULL,

- 	{ (void *)-1, (void *)-1 },

- 	{ NULL, NULL }

- };

+ static dns_name_t uuid_rootname = DNS_NAME_INITABSOLUTE(uuid_rootname_ndata, uuid_rootname_offsets);

  

  struct mldapdb {

  	isc_mem_t	*mctx;

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

  

  #include <unistd.h>

  

+ #include "dyndb-config.h"

  #include <isc/condition.h>

  #include <isc/event.h>

  #include <isc/mutex.h>
@@ -11,7 +12,6 @@ 

  #include <isc/time.h>

  #include <isc/util.h>

  

- #include "dyndb-config.h"

  #include "ldap_helper.h"

  #include "util.h"

  #include "semaphore.h"

@slev FYI. I have no reproduction to the other issue, though.

1 new commit added

  • Include dydnb-config.h prior to any BIND headers
3 months ago

Thank you for the fix!
I verified it against bind 9.18.24 and 9.16.48.

Thank you for the check.

Pull-Request has been merged by abbra

3 months ago
Metadata