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

diff --git a/CHANGES b/CHANGES
index 67379ead6bd4b13b4b1efe9024364f844bdee1dc..9ed9f0b415fdbe09820db232e7ef1f6b049a182b 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 88749e64f9571e45c213044efd3dc4cac8df359f..0f43a7884e7ec7ce4f34c84dd08d4ad68a0a0d4b 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.130.18.22 2008/01/17 23:45:58 tbox Exp $ */
+/* $Id: nsupdate.c,v 1.130.18.23 2009/04/30 07:12:31 marka Exp $ */
 
 /*! \file */
 
@@ -1328,8 +1328,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;