Remove use of __DATE__ and __TIME__ to facilitate reproducible builds.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 7416d11..f106f5f 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
@@ -49,7 +49,12 @@
 #include <time.h>
 #endif
 
+#ifdef HAVE_GETOPT_LONG
 #include <getopt.h>
+#else
+#include "getopt.h"
+#endif
+
 #include "pidfile.h"
 
 #include "conf.h"
@@ -97,7 +102,7 @@ char *pidfilename = NULL;                    /* pid file location */
 char *logfilename = NULL;                      /* log file location */
 char **g_argv;                                 /* a copy of the cmdline arguments */
 
-static int status;
+static int status = 1;
 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},
@@ -162,6 +167,11 @@ static bool parse_options(int argc, char **argv) {
                                break;
 
                        case 'c':                               /* config file */
+                               if(confbase) {
+                                       fprintf(stderr, "Only one configuration directory can be given.\n");
+                                       usage(true);
+                                       return false;
+                               }
                                confbase = xstrdup(optarg);
                                break;
 
@@ -229,7 +239,13 @@ static bool parse_options(int argc, char **argv) {
 
                        case 'n':                               /* net name given */
                                /* netname "." is special: a "top-level name" */
-                               netname = strcmp(optarg, ".") != 0 ? xstrdup(optarg) : NULL;
+                               if(netname) {
+                                       fprintf(stderr, "Only one netname can be given.\n");
+                                       usage(true);
+                                       return false;
+                               }
+                               if(optarg && strcmp(optarg, "."))
+                                       netname = xstrdup(optarg);
                                break;
 
                        case 'o':                               /* option */
@@ -281,11 +297,22 @@ static bool parse_options(int argc, char **argv) {
                                use_logfile = true;
                                if(!optarg && optind < argc && *argv[optind] != '-')
                                        optarg = argv[optind++];
-                               if(optarg)
+                               if(optarg) {
+                                       if(logfilename) {
+                                               fprintf(stderr, "Only one logfile can be given.\n");
+                                               usage(true);
+                                               return false;
+                                       }
                                        logfilename = xstrdup(optarg);
+                               }
                                break;
 
                        case 5:                                 /* write PID to a file */
+                               if(pidfilename) {
+                                       fprintf(stderr, "Only one pidfile can be given.\n");
+                                       usage(true);
+                                       return false;
+                               }
                                pidfilename = xstrdup(optarg);
                                break;
 
@@ -350,7 +377,6 @@ static void indicator(int a, int b, void *p) {
 static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
-       char *name = get_name();
        char *pubname, *privname;
 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
@@ -378,10 +404,14 @@ static bool keygen(int bits) {
        PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);
 
-       if(name)
+       char *name = get_name();
+
+       if(name) {
                xasprintf(&pubname, "%s/hosts/%s", confbase, name);
-       else
+               free(name);
+       } else {
                xasprintf(&pubname, "%s/rsa_key.pub", confbase);
+       }
 
        f = ask_and_open(pubname, "public RSA key");
        free(pubname);
@@ -392,7 +422,6 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
-       free(name);
 
        return true;
 }
@@ -415,14 +444,14 @@ static void make_names(void) {
 #ifdef HAVE_MINGW
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, (LPBYTE)installdir, &len)) {
-                       if(!logfilename)
-                               xasprintf(&logfilename, "%s/log/%s.log", identname);
                        if(!confbase) {
                                if(netname)
                                        xasprintf(&confbase, "%s/%s", installdir, netname);
                                else
                                        xasprintf(&confbase, "%s", installdir);
                        }
+                       if(!logfilename)
+                               xasprintf(&logfilename, "%s/tinc.log", confbase);
                }
                RegCloseKey(key);
                if(*installdir)
@@ -524,9 +553,8 @@ int main(int argc, char **argv) {
        make_names();
 
        if(show_version) {
-               printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
-                          VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2013 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("%s version %s\n", PACKAGE, VERSION);
+               printf("Copyright (C) 1998-2016 Ivo Timmermans, Guus Sliepen and others.\n"
                                "See the AUTHORS file for a complete list.\n\n"
                                "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
                                "and you are welcome to redistribute it under certain conditions;\n"