oraclebackend: fix records pointing at root

diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc
index 5020cf9dc6cf9a8cda480c53cf211372eed58935..f17033ecfc2b56ba5ddd1945a70e6330ab930e24 100644 (file)
--- a/modules/oraclebackend/oraclebackend.cc
+++ b/modules/oraclebackend/oraclebackend.cc
@@ -984,8 +984,8 @@ bool OracleBackend::get (DNSResourceRecord &rr)
 
   check_indicator(mResultNameInd, false);
   check_indicator(mResultTTLInd, false);
-  check_indicator(mResultTypeInd, false);
-  check_indicator(mResultContentInd, false);
+  check_indicator(mResultTypeInd, true);
+  check_indicator(mResultContentInd, true);
   check_indicator(mResultZoneIdInd, false);
   check_indicator(mResultLastChangeInd, false);
   if (d_dnssecQueries)

diff --git a/modules/oraclebackend/schema.oracle.sql b/modules/oraclebackend/schema.oracle.sql
index 471e08092058bc664eb2bdd7cc0037a782ff3c24..39cca8f29bbeebcd8a51c734d9092b342b1f2125 100644 (file)
--- a/modules/oraclebackend/schema.oracle.sql
+++ b/modules/oraclebackend/schema.oracle.sql
@@ -122,8 +122,9 @@ CREATE TABLE Records (
   CONSTRAINT chk_records_type CHECK (type = upper(type)),
   CONSTRAINT unq_records_zntc UNIQUE (zone_id, fqdn, type, content),
   CONSTRAINT chk_records_tc CHECK (
-    type IS NULL AND content IS NULL OR
-    type IS NOT NULL AND content IS NOT NULL
+    content IS NOT NULL OR
+    type IN('NS', 'CNAME') OR
+    type IS NULL
   ),
   CONSTRAINT chk_records_auth CHECK (auth IN (0, 1))
 );