Move poly1305_get_tag() into poly1305.c, hide poly1305_init().

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index b8155cb..676ecec 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -44,6 +44,7 @@
 #include "sandbox.h"
 #include "pidfile.h"
 #include "console.h"
+#include "fs.h"
 
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
@@ -1676,7 +1677,7 @@ const var_t variables[] = {
        {"DeviceType", VAR_SERVER},
        {"DirectOnly", VAR_SERVER | VAR_SAFE},
        {"Ed25519PrivateKeyFile", VAR_SERVER},
-       {"ExperimentalProtocol", VAR_SERVER},
+       {"ExperimentalProtocol", VAR_SERVER | VAR_OBSOLETE},
        {"Forwarding", VAR_SERVER},
        {"FWMark", VAR_SERVER},
        {"GraphDumpFile", VAR_SERVER | VAR_OBSOLETE},
@@ -2234,19 +2235,8 @@ static int cmd_init(int argc, char *argv[]) {
                return 1;
        }
 
-       if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
-               return 1;
-       }
-
-       if(mkdir(confbase, 0777) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", confbase, strerror(errno));
-               return 1;
-       }
-
-       if(mkdir(hosts_dir, 0777) && errno != EEXIST) {
-               fprintf(stderr, "Could not create directory %s: %s\n", hosts_dir, strerror(errno));
-               return 1;
+       if(!makedirs(DIR_HOSTS | DIR_CONFBASE | DIR_CONFDIR | DIR_CACHE)) {
+               return false;
        }
 
        FILE *f = fopen(tinc_conf, "w");