From 9614664990e906ef108519fcfe9345414f86c6ec Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Thu, 30 May 2013 11:09:29 +1000 Subject: [PATCH] 3578. [bug] 'rndc -c file' now fails if 'file' does not exist. [RT #33571] (cherry picked from commit 17a00ff54c51f6bdfddd7d9ceaef6f2dcf387cc1) --- CHANGES | 3 +++ bin/rndc/rndc.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/CHANGES b/CHANGES index a14a10f19f..1b66703e3b 100644 --- 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 e3e6525f5c..3e4e9af108 100644 --- a/bin/rndc/rndc.c +++ b/bin/rndc/rndc.c @@ -491,6 +491,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);