From 96963e2938417d75e01963683a57a92ed7a1833f Mon Sep 17 00:00:00 2001 From: Kees Monshouwer Date: Mon, 15 Dec 2014 00:07:35 +0100 Subject: [PATCH] oraclebackend: fix records pointing at root --- modules/oraclebackend/oraclebackend.cc | 4 ++-- modules/oraclebackend/schema.oracle.sql | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/oraclebackend/oraclebackend.cc b/modules/oraclebackend/oraclebackend.cc index 5020cf9dc..f17033ecf 100644 --- 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 471e08092..39cca8f29 100644 --- 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)) ); -- 2.49.0