diff --exclude='*~' -Naur ldapdns-2.06.orig/engine.c ldapdns-2.06/engine.c
--- ldapdns-2.06.orig/engine.c	2005-07-29 17:42:40.000000000 -0300
+++ ldapdns-2.06/engine.c	2005-07-29 17:49:44.000000000 -0300
@@ -101,7 +101,7 @@
 			engine_message = 1;
 			pthread_mutex_unlock(&engine_message_mutex);
 			pthread_mutex_lock(&log_lock);
-			log(log_info, "pausing");
+			dolog(log_info, "pausing");
 			pthread_mutex_unlock(&log_lock);
 		}
 		break;
@@ -112,14 +112,14 @@
 			pthread_cond_broadcast(&engine_pause_cond);
 			pthread_mutex_unlock(&engine_message_mutex);
 			pthread_mutex_lock(&log_lock);
-			log(log_info, "resuming");
+			dolog(log_info, "resuming");
 			pthread_mutex_unlock(&log_lock);
 		}
 		break;
 	case SIGTERM:
 	case SIGINT:
 		pthread_mutex_lock(&log_lock);
-		log(log_info, "shutting down");
+		dolog(log_info, "shutting down");
 		pthread_mutex_unlock(&log_lock);
 		pthread_mutex_lock(&engine_message_mutex);
 		if (engine_message == 1) {
@@ -2601,7 +2601,7 @@
 
 finish_axfr_l:
 	if (!response_axstart(c, 1, c->request_name, DNS_T_SOA, DNS_C_IN, c->ttl)
-	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : c->ns->str)
+	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : (c->ns ? c->ns->str : ""))
 	|| !response_addname(c, c->ADM ? c->ADM->str : ldapdns.hostmaster)
 	|| !response_addulong(c, c->serial)
 	|| !response_addulong(c, c->refresh)
@@ -2693,7 +2693,7 @@
 	/* SOA comes first...
 	 */
 	if (!response_axstart(c, 1, c->request_name, DNS_T_SOA, DNS_C_IN, c->ttl)
-	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : c->ns->str)
+	|| !response_addname(c, ldapdns.self_ns ? ldapdns.self_ns : (c->ns ? c->ns->str : ""))
 	|| !response_addname(c, c->ADM ? c->ADM->str : ldapdns.hostmaster)
 	|| !response_addulong(c, c->serial)
 	|| !response_addulong(c, c->refresh)
@@ -3855,10 +3855,10 @@
 	if (ldapdns.one2one_mode) {
 #ifdef ACCELERATE_CACHE
 		if (ldapdns.accelerate_cache)
-			log(log_info, "ldap client caching enabled!");
+			dolog(log_info, "ldap client caching enabled!");
 #endif
 
-		log(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
+		dolog(log_info, "starting ldapdns %s (1:1/%d)", VERSION,
 				ldapdns.handlers);
 
 		/* alternate message loop */
@@ -3891,9 +3891,9 @@
 	}
 
 	if (ldapdns.accelerate_cache)
-		log(log_info, "ldap client caching enabled!");
+		dolog(log_info, "ldap client caching enabled!");
 
-	log(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
+	dolog(log_info, "starting ldapdns %s (%d:%d/%d)", VERSION,
 				ldapdns.ldap_threads, ldapdns.dns_threads,
 				ldapdns.handlers);
 
diff --exclude='*~' -Naur ldapdns-2.06.orig/error.c ldapdns-2.06/error.c
--- ldapdns-2.06.orig/error.c	2005-07-29 17:42:40.000000000 -0300
+++ ldapdns-2.06/error.c	2005-07-29 17:48:54.000000000 -0300
@@ -173,7 +173,7 @@
 	fflush(logfp);
 	va_end(ap);
 }
-void inline log(int lev, const char *m, ...)
+void inline dolog(int lev, const char *m, ...)
 {
 	va_list ap;
 	va_start(ap, m);
diff --exclude='*~' -Naur ldapdns-2.06.orig/error.h ldapdns-2.06/error.h
--- ldapdns-2.06.orig/error.h	2005-07-29 17:42:40.000000000 -0300
+++ ldapdns-2.06/error.h	2005-07-29 17:49:07.000000000 -0300
@@ -23,7 +23,7 @@
 
 void log_init(char *s);
 
-void inline log(int lev, const char *m, ...);
+void inline dolog(int lev, const char *m, ...);
 
 void inline debug(const char *m, ...);
 
diff --exclude='*~' -Naur ldapdns-2.06.orig/ldapdns.c ldapdns-2.06/ldapdns.c
--- ldapdns-2.06.orig/ldapdns.c	2005-07-29 17:42:40.000000000 -0300
+++ ldapdns-2.06/ldapdns.c	2005-07-29 17:50:21.000000000 -0300
@@ -21,6 +21,7 @@
 		list_push(&x, lp->str);
 		list_push(&seen, lp->str);
 HIT:
+	continue;
 	}
 
 	lp = *p;