Merge branch 'master' into 1.1

[tinc] / src / process.c

diff --git a/src/process.c b/src/process.c
index aa6dc56..0e33f26 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -212,7 +212,7 @@ bool detach(void) {
                }
 #else
                if(!statushandle)
-                       exit(install_service());
+                       exit(!install_service());
 #endif
        }
 
@@ -231,9 +231,9 @@ bool execute_script(const char *name, char **envp) {
        int i;
 
 #ifndef HAVE_MINGW
-       len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
+       len = xasprintf(&scriptname, "\"%s" SLASH "%s\"", confbase, name);
 #else
-       len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+       len = xasprintf(&scriptname, "\"%s" SLASH "%s.bat\"", confbase, name);
 #endif
        if(len < 0)
                return false;