adjust builtin syntax checks [RT#15268]

diff --git a/bin/named/builtin.c b/bin/named/builtin.c
index a8ecde959aae17be05fdb916207900fdef333612..bcfbd48c669fd1c9b65c7232a5639e3c90f1eac4 100644 (file)
--- a/bin/named/builtin.c
+++ b/bin/named/builtin.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: builtin.c,v 1.8 2005/08/18 00:57:26 marka Exp $ */
+/* $Id: builtin.c,v 1.9 2005/08/23 03:01:14 marka Exp $ */
 
 /*! \file
  * \brief
@@ -214,11 +214,15 @@ static isc_result_t
 builtin_create(const char *zone, int argc, char **argv,
               void *driverdata, void **dbdata)
 {
+       REQUIRE(argc >= 1);
+
        UNUSED(zone);
        UNUSED(driverdata);
 
-       if ((argc != 1 && strcmp(argv[0], "empty") != 0) ||
-           argc != 3)
+       if (strcmp(argv[0], "empty") == 0) {
+               if (argc != 3)
+                       return (DNS_R_SYNTAX);
+       } else if (argc != 1)
                return (DNS_R_SYNTAX);
 
        if (strcmp(argv[0], "version") == 0)