Commit 5fdc9aaf authored by Andreas Gustafsson's avatar Andreas Gustafsson
Browse files

832. [bug] The default location for named.conf in named-checkconf

                        should depend on --sysconfdir like it does in named.
                        [RT #1258]
parent 6060b0ac
832. [bug] The default location for named.conf in named-checkconf
should depend on --sysconfdir like it does in named.
[RT #1258]
831. [placeholder]
830. [func] Implement 'rndc status'.
......
......@@ -13,7 +13,7 @@
# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
# $Id: Makefile.in,v 1.11 2001/03/30 00:08:32 bwelling Exp $
# $Id: Makefile.in,v 1.12 2001/05/18 23:50:06 gson Exp $
srcdir = @srcdir@
VPATH = @srcdir@
......@@ -23,7 +23,7 @@ top_srcdir = @top_srcdir@
CINCLUDES = ${DNS_INCLUDES} ${ISCCFG_INCLUDES} ${ISC_INCLUDES}
CDEFINES =
CDEFINES = -DNS_SYSCONFDIR=\"${sysconfdir}\"
CWARNINGS =
DNSLIBS = ../../lib/dns/libdns.@A@ @DNS_OPENSSL_LIBS@ @DNS_GSSAPI_LIBS@
......
......@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: named-checkconf.c,v 1.7 2001/03/16 23:00:00 bwelling Exp $ */
/* $Id: named-checkconf.c,v 1.8 2001/05/18 23:50:04 gson Exp $ */
#include <config.h>
......@@ -103,7 +103,7 @@ main(int argc, char **argv) {
if (argv[isc_commandline_index] != NULL)
conffile = argv[isc_commandline_index];
if (conffile == NULL || conffile[0] == '\0')
conffile = "/etc/named.conf";
conffile = NS_SYSCONFDIR "/named.conf";
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment