From 74493af86f953d209c57649178421929e8061c99 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 13 Jan 2011 11:10:27 +1100
Subject: s4-dns: renamed DNS_TYPE_ZERO to DNS_TYPE_TOMBSTONE

we now know that these are tombstone records, with a timestamp

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
---
 source4/dns_server/dlz_bind9.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'source4/dns_server')

diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index d2fa81aee2..7dd06c1b2c 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -220,15 +220,16 @@ static bool b9_single_valued(enum dns_record_type dns_type)
 /*
   see if a DNS type is single valued
  */
-static enum dns_record_type b9_dns_type(const char *type)
+static bool b9_dns_type(const char *type, enum dns_record_type *dtype)
 {
 	int i;
 	for (i=0; i<ARRAY_SIZE(dns_typemap); i++) {
 		if (strcasecmp(dns_typemap[i].typestr, type) == 0) {
-			return dns_typemap[i].dns_type;
+			*dtype = dns_typemap[i].dns_type;
+			return true;
 		}
 	}
-	return DNS_TYPE_ZERO;
+	return false;
 }
 
 
@@ -1410,8 +1411,7 @@ _PUBLIC_ isc_result_t dlz_delrdataset(const char *name, const char *type, void *
 		return ISC_R_FAILURE;
 	}
 
-	dns_type = b9_dns_type(type);
-	if (dns_type == DNS_TYPE_ZERO) {
+	if (!b9_dns_type(type, &dns_type)) {
 		state->log(ISC_LOG_INFO, "samba_dlz: bad dns type %s in delete", type);
 		return ISC_R_FAILURE;
 	}
-- 
cgit