diff --git a/bin/tests/db/dns_db_expirenode_data b/bin/tests/db/dns_db_expirenode_data index cf6a330d6e..f51858a297 100644 --- a/bin/tests/db/dns_db_expirenode_data +++ b/bin/tests/db/dns_db_expirenode_data @@ -4,4 +4,4 @@ # format: # filename type origin class existing_name existing_type # -dns_db_expirenode.data rbt vix.com. in a.vix.com. 10000 0 DNS_R_NOTFOUND +dns_db_expirenode.data rbt vix.com. in a.vix.com. 10000 0 ISC_R_NOTFOUND diff --git a/bin/tests/db/dns_db_find_10_data b/bin/tests/db/dns_db_find_10_data index 1430878b76..d1ab1d3b5d 100644 --- a/bin/tests/db/dns_db_find_10_data +++ b/bin/tests/db/dns_db_find_10_data @@ -4,5 +4,5 @@ # format: # dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results # -dns_db_find_10.data rbt vix.com. in cache a.b.c.vix.com. NS 0 1010 DNS_R_NOTFOUND -dns_db_find_10.data rbt vix.com. in cache a.b.c.vix.com. NS 0 0 DNS_R_SUCCESS +dns_db_find_10.data rbt vix.com. in cache a.b.c.vix.com. NS 0 1010 ISC_R_NOTFOUND +dns_db_find_10.data rbt vix.com. in cache a.b.c.vix.com. NS 0 0 ISC_R_SUCCESS diff --git a/bin/tests/db/dns_db_find_6_data b/bin/tests/db/dns_db_find_6_data index c8ff075fc5..47de0e661c 100644 --- a/bin/tests/db/dns_db_find_6_data +++ b/bin/tests/db/dns_db_find_6_data @@ -5,4 +5,4 @@ # dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results # dns_db_find_6.data rbt vix.com. in zone exploder.vix.com. A 0 0 DNS_R_CNAME -dns_db_find_6.data rbt vix.com. in zone exploder.vix.com. ANY 0 0 DNS_R_SUCCESS +dns_db_find_6.data rbt vix.com. in zone exploder.vix.com. ANY 0 0 ISC_R_SUCCESS diff --git a/bin/tests/db/dns_db_find_8_data b/bin/tests/db/dns_db_find_8_data index 063541d601..4ad0c83cbe 100644 --- a/bin/tests/db/dns_db_find_8_data +++ b/bin/tests/db/dns_db_find_8_data @@ -1,7 +1,7 @@ # -# test data for dns_db_find DNS_R_NXRDATASET +# test data for dns_db_find DNS_R_NXRRSET # # format: # dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results # -dns_db_find_8.data rbt vix.com. in zone a.b.c.vix.com. NS 0 0 DNS_R_NXRDATASET +dns_db_find_8.data rbt vix.com. in zone a.b.c.vix.com. NS 0 0 DNS_R_NXRRSET diff --git a/bin/tests/db/dns_db_find_9_data b/bin/tests/db/dns_db_find_9_data index 283450520b..d80795cf08 100644 --- a/bin/tests/db/dns_db_find_9_data +++ b/bin/tests/db/dns_db_find_9_data @@ -1,7 +1,7 @@ # -# test data for dns_db_find DNS_R_NOTFOUND +# test data for dns_db_find ISC_R_NOTFOUND # # format: # dbfile dbtype dborigin dbclass dbcache findname findtype findopts findtime expected_results # -dns_db_find_9.data rbt vix.com. in cache a.b.c.vix.com. NS 0 0 DNS_R_NOTFOUND +dns_db_find_9.data rbt vix.com. in cache a.b.c.vix.com. NS 0 0 ISC_R_NOTFOUND diff --git a/bin/tests/db/dns_db_findnode_1_data b/bin/tests/db/dns_db_findnode_1_data index e48486438f..a73c42545b 100644 --- a/bin/tests/db/dns_db_findnode_1_data +++ b/bin/tests/db/dns_db_findnode_1_data @@ -1,9 +1,9 @@ # -# test data for dns_db_findnode, case DNS_R_SUCCESS +# test data for dns_db_findnode, case ISC_R_SUCCESS # # format: # filename type origin class cache existingname rdatatype # -dns_db_findnode_1.data rbt vix.com. in zone a.vix.com. NS DNS_R_SUCCESS -dns_db_findnode_1.data rbt vix.com. in zone b.vix.com. A DNS_R_SUCCESS -dns_db_findnode_1.data rbt vix.com. in zone c.vix.com. A DNS_R_NOTFOUND +dns_db_findnode_1.data rbt vix.com. in zone a.vix.com. NS ISC_R_SUCCESS +dns_db_findnode_1.data rbt vix.com. in zone b.vix.com. A ISC_R_SUCCESS +dns_db_findnode_1.data rbt vix.com. in zone c.vix.com. A ISC_R_NOTFOUND diff --git a/bin/tests/db/dns_db_load_data b/bin/tests/db/dns_db_load_data index 6e0ce4b5d3..0684c625aa 100644 --- a/bin/tests/db/dns_db_load_data +++ b/bin/tests/db/dns_db_load_data @@ -4,4 +4,4 @@ # format: # filename type origin cache class findname expected_result # -dns_db_load_1.data rbt . zone in DNS_R_SUCCESS a. A DNS_R_DELEGATION +dns_db_load_1.data rbt . zone in ISC_R_SUCCESS a. A DNS_R_DELEGATION diff --git a/bin/tests/dst/dst_2_data b/bin/tests/dst/dst_2_data index a52c88f0ac..1b4e316d50 100644 --- a/bin/tests/dst/dst_2_data +++ b/bin/tests/dst/dst_2_data @@ -4,13 +4,13 @@ # format: # datafile, sigpath, keyname, keyid, alg, exp_result # -t2_data_1 t2_dsasig test. 6204 DST_ALG_DSA DNS_R_SUCCESS -t2_data_1 t2_rsasig test. 54622 DST_ALG_RSA DNS_R_SUCCESS +t2_data_1 t2_dsasig test. 6204 DST_ALG_DSA ISC_R_SUCCESS +t2_data_1 t2_rsasig test. 54622 DST_ALG_RSA ISC_R_SUCCESS # wrong sig -t2_data_1 t2_dsasig test. 54622 DST_ALG_RSA !DNS_R_SUCCESS +t2_data_1 t2_dsasig test. 54622 DST_ALG_RSA !ISC_R_SUCCESS # wrong key -#t2_data_1 t2_dsasig test. 54622 DST_ALG_DSA !DNS_R_SUCCESS +#t2_data_1 t2_dsasig test. 54622 DST_ALG_DSA !ISC_R_SUCCESS # wrong alg -#t2_data_1 t2_dsasig test. 6204 DST_ALG_RSA !DNS_R_SUCCESS +#t2_data_1 t2_dsasig test. 6204 DST_ALG_RSA !ISC_R_SUCCESS # wrong data -t2_data_2 t2_dsasig test. 6204 DST_ALG_DSA !DNS_R_SUCCESS +t2_data_2 t2_dsasig test. 6204 DST_ALG_DSA !ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_1_data b/bin/tests/master/dns_master_load_1_data index 1140ba6d43..fc92c748a3 100644 --- a/bin/tests/master/dns_master_load_1_data +++ b/bin/tests/master/dns_master_load_1_data @@ -9,4 +9,4 @@ # class is the zone's class # expected_result is a text representation of a dns_result_t # -master1.data test in DNS_R_SUCCESS +master1.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_2_data b/bin/tests/master/dns_master_load_2_data index b71c2dae17..a6e44b34cc 100644 --- a/bin/tests/master/dns_master_load_2_data +++ b/bin/tests/master/dns_master_load_2_data @@ -9,4 +9,4 @@ # class is the zone's class # expected_result is a text representation of a dns_result_t # -master2.data test in DNS_R_UNEXPECTEDEND +master2.data test in ISC_R_UNEXPECTEDEND diff --git a/bin/tests/master/dns_master_load_6_data b/bin/tests/master/dns_master_load_6_data index 8d0621cdc6..d14aa88892 100644 --- a/bin/tests/master/dns_master_load_6_data +++ b/bin/tests/master/dns_master_load_6_data @@ -9,4 +9,4 @@ # class is the zone's class # expected_result is a text representation of a dns_result_t # -master6.data test in DNS_R_SUCCESS +master6.data test in ISC_R_SUCCESS diff --git a/bin/tests/master/dns_master_load_7_data b/bin/tests/master/dns_master_load_7_data index 5d3c8d7cdf..dbe7ef9a64 100644 --- a/bin/tests/master/dns_master_load_7_data +++ b/bin/tests/master/dns_master_load_7_data @@ -9,4 +9,4 @@ # class is the zone's class # expected_result is a text representation of a dns_result_t # -master7.data test in DNS_R_SUCCESS +master7.data test in ISC_R_SUCCESS diff --git a/bin/tests/names/dns_name_fromwire_1_data b/bin/tests/names/dns_name_fromwire_1_data index 46628673b6..7816699dde 100644 --- a/bin/tests/names/dns_name_fromwire_1_data +++ b/bin/tests/names/dns_name_fromwire_1_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test1.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_SUCCESS +wire_test1.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_SUCCESS diff --git a/bin/tests/names/dns_name_fromwire_2_data b/bin/tests/names/dns_name_fromwire_2_data index 748688889e..728d5da2a6 100644 --- a/bin/tests/names/dns_name_fromwire_2_data +++ b/bin/tests/names/dns_name_fromwire_2_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test2.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_NOSPACE +wire_test2.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_fromwire_3_data b/bin/tests/names/dns_name_fromwire_3_data index fd6ca5ff37..22277891dd 100644 --- a/bin/tests/names/dns_name_fromwire_3_data +++ b/bin/tests/names/dns_name_fromwire_3_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # wire_test3_1.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_BADLABELTYPE diff --git a/bin/tests/names/dns_name_fromwire_4_data b/bin/tests/names/dns_name_fromwire_4_data index b63fb07185..f51b1b697d 100644 --- a/bin/tests/names/dns_name_fromwire_4_data +++ b/bin/tests/names/dns_name_fromwire_4_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test4.data 550 1 DNS_COMPRESS_ALL vix.com. DNS_R_NOSPACE +wire_test4.data 550 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_fromwire_5_data b/bin/tests/names/dns_name_fromwire_5_data index 0aca1ba863..b813557d07 100644 --- a/bin/tests/names/dns_name_fromwire_5_data +++ b/bin/tests/names/dns_name_fromwire_5_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # wire_test5.data 25 1 DNS_COMPRESS_NONE vix.com. DNS_R_DISALLOWED diff --git a/bin/tests/names/dns_name_fromwire_6_data b/bin/tests/names/dns_name_fromwire_6_data index 77f56e5014..319515da2a 100644 --- a/bin/tests/names/dns_name_fromwire_6_data +++ b/bin/tests/names/dns_name_fromwire_6_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # wire_test6.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_BADPOINTER diff --git a/bin/tests/names/dns_name_fromwire_7_data b/bin/tests/names/dns_name_fromwire_7_data index 8a5f092cb0..7b47691ce0 100644 --- a/bin/tests/names/dns_name_fromwire_7_data +++ b/bin/tests/names/dns_name_fromwire_7_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test7.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_UNEXPECTEDEND +wire_test7.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_UNEXPECTEDEND diff --git a/bin/tests/names/dns_name_fromwire_8_data b/bin/tests/names/dns_name_fromwire_8_data index b1e3014bf8..ddf49f3ce9 100644 --- a/bin/tests/names/dns_name_fromwire_8_data +++ b/bin/tests/names/dns_name_fromwire_8_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # wire_test8.data 383 1 DNS_COMPRESS_ALL vix.com. DNS_R_TOOMANYHOPS diff --git a/bin/tests/names/dns_name_fromwire_9_data b/bin/tests/names/dns_name_fromwire_9_data index 10ed4ed87d..2f6cb1bc79 100644 --- a/bin/tests/names/dns_name_fromwire_9_data +++ b/bin/tests/names/dns_name_fromwire_9_data @@ -22,11 +22,11 @@ # or case conversion # # and where exp_result may be one of -# DNS_R_NOSPACE +# ISC_R_NOSPACE # DNS_R_BADLABELTYPE # DNS_R_DISALLOWED # DNS_R_BADPOINTER -# DNS_R_UNEXPECTEDEND +# ISC_R_UNEXPECTEDEND # DNS_R_TOOMANYHOPS # -wire_test9.data 25 1 DNS_COMPRESS_ALL vix.com. DNS_R_NOSPACE +wire_test9.data 25 1 DNS_COMPRESS_ALL vix.com. ISC_R_NOSPACE diff --git a/bin/tests/names/dns_name_towire_1_data b/bin/tests/names/dns_name_towire_1_data index b592317a73..a853989fcc 100644 --- a/bin/tests/names/dns_name_towire_1_data +++ b/bin/tests/names/dns_name_towire_1_data @@ -16,4 +16,4 @@ # and where exp_data_len is the length of the expected data in decimal format # and where exp_result is the expected return value of dns_name_towire # -a.vix.com. DNS_COMPRESS_NONE 01610376697803636f6d00 11 DNS_R_SUCCESS +a.vix.com. DNS_COMPRESS_NONE 01610376697803636f6d00 11 ISC_R_SUCCESS diff --git a/bin/tests/names/dns_name_towire_2_data b/bin/tests/names/dns_name_towire_2_data index e74201a08a..77bfc92eed 100644 --- a/bin/tests/names/dns_name_towire_2_data +++ b/bin/tests/names/dns_name_towire_2_data @@ -16,4 +16,4 @@ # and where exp_data_len is the length of the expected data in decimal format # and where exp_result is the expected return value of dns_name_towire # -a.vix.com DNS_COMPRESS_NONE 01610376697803636f6d 10 DNS_R_NOSPACE +a.vix.com DNS_COMPRESS_NONE 01610376697803636f6d 10 ISC_R_NOSPACE