mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 14:35:26 +00:00
Revert "Re-created rt27597a for ongoing DLZ work"
This reverts commit d731ee9121
.
This commit is contained in:
@@ -51,11 +51,5 @@ $CHECKCONF dnssec.3 2>&1 | grep '.*' && ret=1
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I: checking named-checkconf DLZ warnings"
|
||||
ret=0
|
||||
$CHECKCONF dlz-bad.conf 2>&1 | grep "'dlz' and 'database'" > /dev/null || ret=1
|
||||
if [ $ret != 0 ]; then echo "I:failed"; fi
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:exit status: $status"
|
||||
exit $status
|
||||
|
@@ -7,4 +7,3 @@ rm -f ns1/update.txt
|
||||
rm -f */named.memstats
|
||||
rm -f ns1/ddns.key
|
||||
rm -f random.data
|
||||
rm -f dig.out*
|
||||
|
@@ -463,7 +463,7 @@ dlz_closeversion(const char *zone, isc_boolean_t commit,
|
||||
* Configure a writeable zone
|
||||
*/
|
||||
isc_result_t
|
||||
dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) {
|
||||
dlz_configure(dns_view_t *view, void *dbdata) {
|
||||
struct dlz_example_data *state = (struct dlz_example_data *)dbdata;
|
||||
isc_result_t result;
|
||||
|
||||
@@ -475,7 +475,7 @@ dlz_configure(dns_view_t *view, dns_dlzdb_t *dlzdb, void *dbdata) {
|
||||
return (ISC_R_FAILURE);
|
||||
}
|
||||
|
||||
result = state->writeable_zone(view, dlzdb, state->zone_name);
|
||||
result = state->writeable_zone(view, state->zone_name);
|
||||
if (result != ISC_R_SUCCESS) {
|
||||
state->log(ISC_LOG_ERROR,
|
||||
"dlz_example: failed to configure zone %s",
|
||||
|
@@ -70,21 +70,4 @@ done
|
||||
[ "$ret" -eq 0 ] || echo "I:failed"
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:testing multiple DLZ drivers"
|
||||
test_update testdc1.alternate.nil. A "86400 A 10.53.0.10" "10.53.0.10" || ret=1
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:testing AXFR from DLZ drivers"
|
||||
$DIG $DIGOPTS +noall +answer axfr example.nil > dig.out.ns1.1
|
||||
n=`cat dig.out.ns1.1 | wc -l`
|
||||
[ "$n" -eq 7 ] || ret=1
|
||||
$DIG $DIGOPTS +noall +answer axfr alternate.nil > dig.out.ns1.2
|
||||
n=`cat dig.out.ns1.2 | wc -l`
|
||||
[ "$n" -eq 5 ] || ret=1
|
||||
status=`expr $status + $ret`
|
||||
|
||||
echo "I:testing unsearched DLZ driver"
|
||||
$DIG $DIGOPTS +noall +answer ns other.nil > dig.out.ns1.3
|
||||
cat dig.out.ns1.3
|
||||
|
||||
exit $status
|
||||
|
Reference in New Issue
Block a user