From 76dbcf89895e87144e1bcb3b5cb98ffce03c383b Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 20 Jan 2013 21:02:58 +0100 Subject: [PATCH] Fix tincctl init when /etc/tinc does not yet exist. --- src/Makefile.am | 2 +- src/names.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ea4da6df..eeee1529 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -46,7 +46,7 @@ INCLUDES = @INCLUDES@ -I$(top_builddir) noinst_HEADERS = \ xalloc.h utils.h getopt.h list.h splay_tree.h dropin.h fake-getaddrinfo.h fake-getnameinfo.h fake-gai-errnos.h ipv6.h ipv4.h ethernet.h \ buffer.h conf.h connection.h control.h control_common.h device.h edge.h graph.h info.h logger.h meta.h net.h netutl.h node.h process.h \ - protocol.h route.h subnet.h sptps.h tincctl.h top.h bsd/tunemu.h hash.h event.h + protocol.h route.h subnet.h sptps.h tincctl.h top.h bsd/tunemu.h hash.h event.h names.h nodist_noinst_HEADERS = \ cipher.h crypto.h ecdh.h ecdsa.h digest.h prf.h rsa.h ecdsagen.h rsagen.h diff --git a/src/names.c b/src/names.c index 1fb0a8f2..c42b9534 100644 --- a/src/names.c +++ b/src/names.c @@ -66,7 +66,7 @@ void make_names(void) { } #endif if(!confdir) - confdir = xstrdup(CONFDIR); + confdir = xstrdup(CONFDIR SLASH "tinc"); if(!logfilename) xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); -- 2.20.1