3578. [bug] 'rndc -c file' now fails if 'file' does not exist.

                        [RT #33571]

diff --git a/CHANGES b/CHANGES
index 24a9afb14005d6f64ec24b9947f3f89c340c0ca6..06c4313405cf2bf3a320db782f5ff2bb9e41a530 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3578.  [bug]           'rndc -c file' now fails if 'file' does not exist.
+                       [RT #33571]
+
 3577.  [bug]           Handle zero TTL values better. [RT #33411]
 
 3576.  [bug]           Address a shutdown race when validating. [RT #33573]

diff --git a/bin/rndc/rndc.c b/bin/rndc/rndc.c
index 8dde10278beeda0c7b73127655a8e42d75ce6c3d..0f69f5fcea05ea4eb9c6cd47f67419d6fd675b4e 100644 (file)
--- a/bin/rndc/rndc.c
+++ b/bin/rndc/rndc.c
@@ -499,6 +499,9 @@ parse_config(isc_mem_t *mctx, isc_log_t *log, const char *keyname,
                conffile = admin_keyfile;
                conftype = &cfg_type_rndckey;
 
+               if (c_flag)
+                       fatal("%s does not exist", admin_conffile);
+
                if (! isc_file_exists(conffile))
                        fatal("neither %s nor %s was found",
                              admin_conffile, admin_keyfile);