2592. [bug] Treat "any" as a type in nsupdate. [RT #19455]

diff --git a/CHANGES b/CHANGES
index 20fe5127b5f144ee465938007199630a7bb6c8be..889e6b3fb8c7c2932e405d1075a89d40055e0c10 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+2592.  [bug]           Treat "any" as a type in nsupdate. [RT #19455]
+
 2591.  [bug]           named could die when processing a update in
                        removed_orphaned_ds(). [RT #19507]
 

diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index 66e83114d0d03cd6c574b8d34b27227f91bd81b2..6cf4cf42ea3ca979f0a58d0512d21e4b21512206 100644 (file)
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.163.48.2 2009/01/18 23:47:34 tbox Exp $ */
+/* $Id: nsupdate.c,v 1.163.48.3 2009/04/30 07:12:49 marka Exp $ */
 
 /*! \file */
 
@@ -1541,8 +1541,9 @@ update_addordelete(char *cmdline, isc_boolean_t isdelete) {
        }
        region.base = word;
        region.length = strlen(word);
+       rdataclass = dns_rdataclass_any;
        result = dns_rdataclass_fromtext(&rdataclass, &region);
-       if (result == ISC_R_SUCCESS) {
+       if (result == ISC_R_SUCCESS && rdataclass != dns_rdataclass_any) {
                if (!setzoneclass(rdataclass)) {
                        fprintf(stderr, "class mismatch: %s\n", word);
                        goto failure;