Don't try to mkdir(CONFDIR) if --config is used.

[tinc] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index 6e7965c..a986af7 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -1606,7 +1606,7 @@ static int cmd_config(int argc, char *argv[]) {
        if(action < 0 && !removed) {
                remove(tmpfile);
                fprintf(stderr, "No configuration variables deleted.\n");
-               return *value;
+               return *value != 0;
        }
 
        // Replace the configuration file with the new one
@@ -1739,7 +1739,7 @@ static int cmd_init(int argc, char *argv[]) {
                return 1;
        }
 
-       if(strcmp(confdir, confbase) && mkdir(confdir, 0755) && errno != EEXIST) {
+       if(!confbase_given && mkdir(confdir, 0755) && errno != EEXIST) {
                fprintf(stderr, "Could not create directory %s: %s\n", confdir, strerror(errno));
                return 1;
        }