diff -up bind-9.3.6-P1/bin/named_sdb/Makefile.in.includes bind-9.3.6-P1/bin/named_sdb/Makefile.in --- bind-9.3.6-P1/bin/named_sdb/Makefile.in.includes 2009-02-23 15:38:53.000000000 +0100 +++ bind-9.3.6-P1/bin/named_sdb/Makefile.in 2009-02-23 15:43:13.000000000 +0100 @@ -34,7 +34,7 @@ DBDRIVER_LIBS = -lldap -llber -lpq CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ - ${DBDRIVER_INCLUDES} + ${DBDRIVER_INCLUDES} -DLDAP_DEPRECATED DBUS_INCLUDES = \ -I/usr/lib/dbus-1.0/include -I/usr/include/dbus-1.0 CDEFINES = diff -up bind-9.3.6-P1/bin/sdb_tools/ldap2zone.c.includes bind-9.3.6-P1/bin/sdb_tools/ldap2zone.c --- bind-9.3.6-P1/bin/sdb_tools/ldap2zone.c.includes 2009-02-23 15:38:53.000000000 +0100 +++ bind-9.3.6-P1/bin/sdb_tools/ldap2zone.c 2009-02-23 15:38:53.000000000 +0100 @@ -9,6 +9,8 @@ #include <sys/types.h> #include <stdio.h> +#include <stdlib.h> +#include <ctype.h> #include <ldap.h> @@ -23,6 +25,16 @@ struct assstack_entry { struct assstack_entry *next; }; +struct assstack_entry *assstack_find(struct assstack_entry *stack, struct string *key); +void assstack_push(struct assstack_entry **stack, struct assstack_entry *item); +void assstack_insertbottom(struct assstack_entry **stack, struct assstack_entry *item); +void printsoa(struct string *soa); +void printrrs(char *defaultttl, struct assstack_entry *item); +void print_zone(char *defaultttl, struct assstack_entry *stack); +void usage(char *name); +void err(char *name, const char *msg); +int putrr(struct assstack_entry **stack, struct berval *name, char *type, char *ttl, struct berval *val); + struct assstack_entry *assstack_find(struct assstack_entry *stack, struct string *key) { for (; stack; stack = stack->next) if (stack->key.len == key->len && !memcmp(stack->key.data, key->data, key->len)) @@ -53,7 +65,7 @@ void assstack_insertbottom(struct asssta void printsoa(struct string *soa) { char *s; - int i; + size_t i; s = (char *)soa->data; i = 0; @@ -105,7 +117,7 @@ void printrrs(char *defaultttl, struct a struct assstack_entry *stack; char *s; int first; - int i; + size_t i; char *ttl, *type; int top; @@ -168,7 +180,7 @@ void usage(char *name) { exit(1); }; -void err(char *name, char *msg) { +void err(char *name, const char *msg) { fprintf(stderr, "%s: %s\n", name, msg); exit(1); }; diff -up bind-9.3.6-P1/bin/sdb_tools/Makefile.in.includes bind-9.3.6-P1/bin/sdb_tools/Makefile.in --- bind-9.3.6-P1/bin/sdb_tools/Makefile.in.includes 2009-02-23 15:38:53.000000000 +0100 +++ bind-9.3.6-P1/bin/sdb_tools/Makefile.in 2009-02-23 15:38:53.000000000 +0100 @@ -8,7 +8,8 @@ top_srcdir = @top_srcdir@ CINCLUDES = -I${srcdir}/include -I${srcdir}/unix/include \ ${LWRES_INCLUDES} ${DNS_INCLUDES} ${BIND9_INCLUDES} \ - ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} + ${ISCCFG_INCLUDES} ${ISCCC_INCLUDES} ${ISC_INCLUDES} \ + -DLDAP_DEPRECATED DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_CRYPTO_LIBS@ ISCCFGLIBS = ../../lib/isccfg/libisccfg.@A@