Correct size argument for strncat().
[tinc] / src / process.c
index 9194bed..0ea65b3 100644 (file)
@@ -81,30 +81,30 @@ bool install_service(void) {
        }
 
        if(!strchr(program_name, '\\')) {
-               GetCurrentDirectory(sizeof(command) - 1, command + 1);
-               strncat(command, "\\", sizeof(command));
+               GetCurrentDirectory(sizeof command - 1, command + 1);
+               strncat(command, "\\", sizeof command - strlen(command));
        }
 
-       strncat(command, program_name, sizeof(command));
+       strncat(command, program_name, sizeof command - strlen(command));
 
-       strncat(command, "\"", sizeof(command));
+       strncat(command, "\"", sizeof command - strlen(command));
 
        for(argp = g_argv + 1; *argp; argp++) {
                space = strchr(*argp, ' ');
-               strncat(command, " ", sizeof(command));
+               strncat(command, " ", sizeof command - strlen(command));
                
                if(space)
-                       strncat(command, "\"", sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
                
-               strncat(command, *argp, sizeof(command));
+               strncat(command, *argp, sizeof command - strlen(command));
 
                if(space)
-                       strncat(command, "\"", sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
        }
 
        service = CreateService(manager, identname, identname,
                        SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
-                       command, "NDIS", NULL, NULL, NULL, NULL);
+                       command, NULL, NULL, NULL, NULL, NULL);
        
        if(!service) {
                logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));