Replace asprintf() by xasprintf().

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index d359425..a13e266 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,7 +337,7 @@ static bool keygen(int bits)
        } else
                fprintf(stderr, _("Done.\n"));
 
-       asprintf(&filename, "%s/rsa_key.priv", confbase);
+       xasprintf(&filename, "%s/rsa_key.priv", confbase);
        f = ask_and_open(filename, _("private RSA key"));
 
        if(!f)
@@ -356,9 +356,9 @@ static bool keygen(int bits)
        free(filename);
 
        if(name)
-               asprintf(&filename, "%s/hosts/%s", confbase, name);
+               xasprintf(&filename, "%s/hosts/%s", confbase, name);
        else
-               asprintf(&filename, "%s/rsa_key.pub", confbase);
+               xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
        f = ask_and_open(filename, _("public RSA key"));
 
@@ -389,7 +389,7 @@ static void make_names(void)
 #endif
 
        if(netname)
-               asprintf(&identname, "tinc.%s", netname);
+               xasprintf(&identname, "tinc.%s", netname);
        else
                identname = xstrdup("tinc");
 
@@ -397,12 +397,12 @@ static void make_names(void)
        if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
                if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
                        if(!logfilename)
-                               asprintf(&logfilename, "%s/log/%s.log", identname);
+                               xasprintf(&logfilename, "%s/log/%s.log", identname);
                        if(!confbase) {
                                if(netname)
-                                       asprintf(&confbase, "%s/%s", installdir, netname);
+                                       xasprintf(&confbase, "%s/%s", installdir, netname);
                                else
-                                       asprintf(&confbase, "%s", installdir);
+                                       xasprintf(&confbase, "%s", installdir);
                        }
                }
                RegCloseKey(key);
@@ -412,19 +412,19 @@ static void make_names(void)
 #endif
 
        if(!pidfilename)
-               asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+               xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
 
        if(!logfilename)
-               asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
+               xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
 
        if(netname) {
                if(!confbase)
-                       asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+                       xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
                else
                        logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
        } else {
                if(!confbase)
-                       asprintf(&confbase, CONFDIR "/tinc");
+                       xasprintf(&confbase, CONFDIR "/tinc");
        }
 }
 
@@ -485,7 +485,7 @@ static bool drop_privs() {
 }
 
 #ifdef HAVE_MINGW
-# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level);
+# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level)
 #else
 # define NORMAL_PRIORITY_CLASS 0
 # define BELOW_NORMAL_PRIORITY_CLASS 10
@@ -589,7 +589,11 @@ int main2(int argc, char **argv)
        if(!setup_network())
                goto end;
 
-        /* Change process priority */
+       /* Initiate all outgoing connections. */
+
+       try_outgoing_connections();
+
+       /* Change process priority */
 
         char *priority = 0;
 
@@ -610,10 +614,6 @@ int main2(int argc, char **argv)
        if (!drop_privs())
                goto end;
 
-       /* Initiate all outgoing connections. */
-
-       try_outgoing_connections();
-
        /* Start main loop. It only exits when tinc is killed. */
 
        status = main_loop();