Fix tincctl init when /etc/tinc does not yet exist.

diff --git a/src/Makefile.am b/src/Makefile.am
index ea4da6df9c06611793f623d80b40fea11e1075eb..eeee1529812d27ca27272cc8a22314fdebaeb373 100644 (file)
--- 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 1fb0a8f20e087a126d06ab8095afb091e252c579..c42b95348944c35caf87b261e0216e25ca2ff265 100644 (file)
--- 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);