Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / tincctl.c

diff --git a/src/tincctl.c b/src/tincctl.c
index b2e6e82172e2a08c49f270699ff5980d0361a100..4f06daa63bce5d6e6506f761f3b2070ecbcb867d 100644 (file)
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -516,7 +516,7 @@ static bool remove_service(void) {
 }
 #endif
 
-int main(int argc, char *argv[], char *envp[]) {
+int main(int argc, char *argv[]) {
        int fd;
        int result;
        char host[128];
@@ -577,7 +577,7 @@ int main(int argc, char *argv[], char *envp[]) {
 #endif
                if (slash++) {
                        c = xmalloc((slash - argv[0]) + sizeof("tincd"));
-                       sprintf(c, "%.*stincd", slash - argv[0], argv[0]);
+                       sprintf(c, "%.*stincd", (int)(slash - argv[0]), argv[0]);
                }
                else
                        c = "tincd";
@@ -586,7 +586,7 @@ int main(int argc, char *argv[], char *envp[]) {
                        if (i != optind && strcmp(argv[i], "--") != 0)
                                argv[j++] = argv[i];
                argv[j] = NULL;
-               execve(c, argv, envp);
+               execvp(c, argv);
                fprintf(stderr, "Could not start %s: %s\n", c, strerror(errno));
                return 1;
        }