3fed71e
diff --git a/contrib/sdb/bdb/bdb.c b/contrib/sdb/bdb/bdb.c
3fed71e
index 23594bb..b3c6619 100644
3fed71e
--- a/contrib/sdb/bdb/bdb.c
3fed71e
+++ b/contrib/sdb/bdb/bdb.c
3fed71e
@@ -43,7 +43,7 @@
3fed71e
 #include <dns/lib.h>
3fed71e
 #include <dns/ttl.h>
3fed71e
 
3fed71e
-#include <named/bdb.h>
3fed71e
+#include "bdb.h"
3fed71e
 #include <named/globals.h>
3fed71e
 #include <named/config.h>
3fed71e
 
3fed71e
diff --git a/contrib/sdb/ldap/zone2ldap.c b/contrib/sdb/ldap/zone2ldap.c
3fed71e
index 07c89bc..23dd873 100644
3fed71e
--- a/contrib/sdb/ldap/zone2ldap.c
3fed71e
+++ b/contrib/sdb/ldap/zone2ldap.c
3fed71e
@@ -63,16 +63,16 @@ typedef struct LDAP_INFO
jvdias 207484f
 ldap_info;
jvdias 207484f
 
jvdias 207484f
 /* usage Info */
jvdias 207484f
-void usage ();
jvdias 207484f
+void usage (void);
jvdias 207484f
 
jvdias 207484f
 /* Add to the ldap dit */
jvdias 207484f
 void add_ldap_values (ldap_info * ldinfo);
jvdias 207484f
 
jvdias 207484f
 /* Init an ldap connection */
jvdias 207484f
-void init_ldap_conn ();
jvdias 207484f
+void init_ldap_conn (void);
jvdias 207484f
 
jvdias 207484f
 /* Ldap error checking */
jvdias 207484f
-void ldap_result_check (char *msg, char *dn, int err);
jvdias 207484f
+void ldap_result_check (const char *msg, char *dn, int err);
jvdias 207484f
 
jvdias 207484f
 /* Put a hostname into a char ** array */
jvdias 207484f
 char **hostname_to_dn_list (char *hostname, char *zone, unsigned int flags);
3fed71e
@@ -88,7 +88,7 @@ void add_to_rr_list (char *dn, char *name, char *type, char *data,
jvdias 207484f
 		     unsigned int ttl, unsigned int flags);
jvdias 207484f
 
jvdias 207484f
 /* Error checking */
jvdias 207484f
-void isc_result_check (isc_result_t res, char *errorstr);
jvdias 207484f
+void isc_result_check (isc_result_t res, const char *errorstr);
jvdias 207484f
 
jvdias 207484f
 /* Generate LDIF Format files */
jvdias 207484f
 void generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata,
3fed71e
@@ -97,11 +97,17 @@ void generate_ldap (dns_name_t * dnsname, dns_rdata_t * rdata,
jvdias 207484f
 /* head pointer to the list */
jvdias 207484f
 ldap_info *ldap_info_base = NULL;
jvdias 207484f
 
jvdias 207484f
+ldap_info *
jvdias 207484f
+locate_by_dn (char *dn);
jvdias 207484f
+void
jvdias 207484f
+init_ldap_conn ();
jvdias 207484f
+void usage();
jvdias 207484f
+
jvdias 207484f
 char *argzone, *ldapbase, *binddn, *bindpw = NULL;
jvdias 207484f
-char *ldapsystem = "localhost";
jvdias 207484f
-static char *objectClasses[] =
jvdias 207484f
+const char *ldapsystem = "localhost";
jvdias 207484f
+static const char *objectClasses[] =
jvdias 207484f
   { "top", "dNSZone", NULL };
jvdias 207484f
-static char *topObjectClasses[] = { "top", NULL };
jvdias 207484f
+static const char *topObjectClasses[] = { "top", NULL };
jvdias 207484f
 LDAP *conn;
jvdias 207484f
 unsigned int debug = 0;
jvdias 207484f
 
3fed71e
@@ -128,7 +134,7 @@ main (int argc, char **argv)
jvdias 207484f
   LDAPMod *base_attrs[2];
jvdias 207484f
   LDAPMod base;
jvdias 207484f
   isc_buffer_t buff;
jvdias 207484f
-  char *zonefile;
jvdias 207484f
+  char *zonefile=0L;
jvdias 207484f
   char fullbasedn[1024];
jvdias 207484f
   char *ctmp;
jvdias 207484f
   dns_fixedname_t fixedzone, fixedname;
3fed71e
@@ -304,9 +310,9 @@ main (int argc, char **argv)
jvdias 207484f
 	  if ((*ctmp == ',') || (ctmp == &basedn[0]))
jvdias 207484f
 	    {
jvdias 207484f
 	      base.mod_op = LDAP_MOD_ADD;
jvdias 207484f
-	      base.mod_type = "objectClass";
jvdias 207484f
-	      base.mod_values = topObjectClasses;
jvdias 207484f
-	      base_attrs[0] = &bas;;
jvdias 207484f
+	      base.mod_type = (char*)"objectClass";
jvdias 207484f
+	      base.mod_values = (char**)topObjectClasses;
jvdias 207484f
+	      base_attrs[0] = (void*)&bas;;
jvdias 207484f
 	      base_attrs[1] = NULL;
jvdias 207484f
 
jvdias 207484f
 	      if (ldapbase)
3fed71e
@@ -363,7 +369,7 @@ main (int argc, char **argv)
jvdias 207484f
  * I should probably rename this function, as not to cause any
jvdias 207484f
  * confusion with the isc* routines. Will exit on error. */
jvdias 207484f
 void
jvdias 207484f
-isc_result_check (isc_result_t res, char *errorstr)
jvdias 207484f
+isc_result_check (isc_result_t res, const char *errorstr)
jvdias 207484f
 {
jvdias 207484f
   if (res != ISC_R_SUCCESS)
jvdias 207484f
     {
3fed71e
@@ -470,20 +476,20 @@ add_to_rr_list (char *dn, char *name, char *type,
3fed71e
       if (tmp->attrs == (LDAPMod **) NULL)
3fed71e
 	fatal("calloc");
jvdias 207484f
 
jvdias 207484f
-      for (i = 0; i < flags; i++)
jvdias 207484f
+      for (i = 0; i < (int)flags; i++)
jvdias 207484f
 	{
jvdias 207484f
 	  tmp->attrs[i] = (LDAPMod *) malloc (sizeof (LDAPMod));
jvdias 207484f
 	  if (tmp->attrs[i] == (LDAPMod *) NULL)
3fed71e
 	    fatal("malloc");
jvdias 207484f
 	}
jvdias 207484f
       tmp->attrs[0]->mod_op = LDAP_MOD_ADD;
jvdias 207484f
-      tmp->attrs[0]->mod_type = "objectClass";
jvdias 207484f
+      tmp->attrs[0]->mod_type = (char*)"objectClass";
jvdias 207484f
 
jvdias 207484f
       if (flags == DNS_OBJECT)
jvdias 207484f
-	tmp->attrs[0]->mod_values = objectClasses;
jvdias 207484f
+	tmp->attrs[0]->mod_values = (char**)objectClasses;
jvdias 207484f
       else
jvdias 207484f
 	{
jvdias 207484f
-	  tmp->attrs[0]->mod_values = topObjectClasses;
jvdias 207484f
+	  tmp->attrs[0]->mod_values = (char**)topObjectClasses;
jvdias 207484f
 	  tmp->attrs[1] = NULL;
jvdias 207484f
 	  tmp->attrcnt = 2;
jvdias 207484f
 	  tmp->next = ldap_info_base;
3fed71e
@@ -492,7 +498,7 @@ add_to_rr_list (char *dn, char *name, char *type,
jvdias 207484f
 	}
jvdias 207484f
 
jvdias 207484f
       tmp->attrs[1]->mod_op = LDAP_MOD_ADD;
jvdias 207484f
-      tmp->attrs[1]->mod_type = "relativeDomainName";
jvdias 207484f
+      tmp->attrs[1]->mod_type = (char*)"relativeDomainName";
jvdias 207484f
       tmp->attrs[1]->mod_values = (char **) calloc (sizeof (char *), 2);
jvdias 207484f
 
jvdias 207484f
       if (tmp->attrs[1]->mod_values == (char **)NULL)
3fed71e
@@ -521,7 +527,7 @@ add_to_rr_list (char *dn, char *name, char *type,
3fed71e
 	 fatal("strdup");
jvdias 207484f
 
jvdias 207484f
       tmp->attrs[3]->mod_op = LDAP_MOD_ADD;
jvdias 207484f
-      tmp->attrs[3]->mod_type = "dNSTTL";
jvdias 207484f
+      tmp->attrs[3]->mod_type = (char*)"dNSTTL";
jvdias 207484f
       tmp->attrs[3]->mod_values = (char **) calloc (sizeof (char *), 2);
jvdias 207484f
 
jvdias 207484f
       if (tmp->attrs[3]->mod_values == (char **)NULL)
3fed71e
@@ -535,7 +541,7 @@ add_to_rr_list (char *dn, char *name, char *type,
3fed71e
 	 fatal("strdup");
jvdias 207484f
 
jvdias 207484f
       tmp->attrs[4]->mod_op = LDAP_MOD_ADD;
jvdias 207484f
-      tmp->attrs[4]->mod_type = "zoneName";
jvdias 207484f
+      tmp->attrs[4]->mod_type = (char*)"zoneName";
jvdias 207484f
       tmp->attrs[4]->mod_values = (char **)calloc(sizeof(char *), 2);
3fed71e
 
3fed71e
       if (tmp->attrs[4]->mod_values == (char **)NULL)
3fed71e
@@ -648,7 +654,7 @@ hostname_to_dn_list (char *hostname, char *zone, unsigned int flags)
jvdias 207484f
 	  zname = ++tmp;
jvdias 207484f
 	}
jvdias 207484f
       else
jvdias 207484f
-	hnamebuff = "@";
jvdias 207484f
+	hnamebuff = (char*)"@";
jvdias 207484f
     }
jvdias 207484f
   else
jvdias 207484f
     {
3fed71e
@@ -727,12 +733,12 @@ init_ldap_conn ()
jvdias 207484f
     }
jvdias 207484f
 
jvdias 207484f
   result = ldap_simple_bind_s (conn, binddn, bindpw);
jvdias 207484f
-  ldap_result_check ("ldap_simple_bind_s", "LDAP Bind", result);
jvdias 207484f
+  ldap_result_check ("ldap_simple_bind_s", (char*)"LDAP Bind", result);
jvdias 207484f
 }
jvdias 207484f
 
jvdias 207484f
 /* Like isc_result_check, only for LDAP */
jvdias 207484f
 void
jvdias 207484f
-ldap_result_check (char *msg, char *dn, int err)
jvdias 207484f
+ldap_result_check (const char *msg, char *dn, int err)
jvdias 207484f
 {
jvdias 207484f
   if ((err != LDAP_SUCCESS) && (err != LDAP_ALREADY_EXISTS))
jvdias 207484f
     {
3fed71e
diff --git a/contrib/sdb/pgsql/pgsqldb.c b/contrib/sdb/pgsql/pgsqldb.c
3fed71e
index 50d3cba..516eb9f 100644
3fed71e
--- a/contrib/sdb/pgsql/pgsqldb.c
3fed71e
+++ b/contrib/sdb/pgsql/pgsqldb.c
jvdias 207484f
@@ -23,7 +23,7 @@
jvdias 207484f
 #include <string.h>
jvdias 207484f
 #include <stdlib.h>
jvdias 207484f
 
jvdias 207484f
-#include <pgsql/libpq-fe.h>
jvdias 207484f
+#include <libpq-fe.h>
jvdias 207484f
 
jvdias 207484f
 #include <isc/mem.h>
jvdias 207484f
 #include <isc/print.h>
3fed71e
diff --git a/contrib/sdb/pgsql/zonetodb.c b/contrib/sdb/pgsql/zonetodb.c
3fed71e
index b8f5912..ff2d135 100644
3fed71e
--- a/contrib/sdb/pgsql/zonetodb.c
3fed71e
+++ b/contrib/sdb/pgsql/zonetodb.c
jvdias 207484f
@@ -37,7 +37,7 @@
jvdias 207484f
 #include <dns/rdatatype.h>
jvdias 207484f
 #include <dns/result.h>
jvdias 207484f
 
jvdias 207484f
-#include <pgsql/libpq-fe.h>
jvdias 207484f
+#include <libpq-fe.h>
jvdias 207484f
 
jvdias 207484f
 /*
jvdias 207484f
  * Generate a PostgreSQL table from a zone.
3fed71e
@@ -54,6 +54,9 @@ char *dbname, *dbtable;
jvdias 207484f
 char str[10240];
jvdias 207484f
 
jvdias 207484f
 void
jvdias 207484f
+closeandexit(int status);
jvdias 207484f
+
jvdias 207484f
+void
jvdias 207484f
 closeandexit(int status) {
jvdias 207484f
 	if (conn != NULL)
jvdias 207484f
 		PQfinish(conn);
3fed71e
@@ -61,6 +64,9 @@ closeandexit(int status) {
jvdias 207484f
 }
jvdias 207484f
 
jvdias 207484f
 void
jvdias 207484f
+check_result(isc_result_t result, const char *message);
jvdias 207484f
+
jvdias 207484f
+void
jvdias 207484f
 check_result(isc_result_t result, const char *message) {
jvdias 207484f
 	if (result != ISC_R_SUCCESS) {
jvdias 207484f
 		fprintf(stderr, "%s: %s\n", message,
3fed71e
@@ -84,7 +90,8 @@ quotestring(const unsigned char *source, unsigned char *dest) {
jvdias 207484f
 	}
jvdias 207484f
 	*dest++ = 0;
jvdias 207484f
 }
jvdias 207484f
-
jvdias 207484f
+void
jvdias 207484f
+addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata);
jvdias 207484f
 void
jvdias 207484f
 addrdata(dns_name_t *name, dns_ttl_t ttl, dns_rdata_t *rdata) {
jvdias 207484f
 	unsigned char namearray[DNS_NAME_MAXTEXT + 1];