X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=0ea65b3195f39c17ab5b47b0459224fc09ab4e52;hp=c1dd2d0f3606c25b909093165f39a2580d0ff9eb;hb=fe0bfa3e65049d6e7cd46cf6caea7eb91b478008;hpb=7926a156e5b118d06295228e57de0cc9de0433b4

diff --git a/src/process.c b/src/process.c
index c1dd2d0f..0ea65b31 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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()));
@@ -362,7 +362,8 @@ bool execute_script(const char *name, char **envp)
 #ifdef HAVE_SYSTEM
 	int status, len;
 	struct stat s;
-	char *scriptname;
+	char *scriptname, *p;
+	int i;
 
 	cp();
 
@@ -386,8 +387,8 @@ bool execute_script(const char *name, char **envp)
 #ifdef HAVE_PUTENV
 	/* Set environment */
 	
-	while(*envp)
-		putenv(*envp++);
+	for(i = 0; envp[i]; i++)
+		putenv(envp[i]);
 #endif
 
 	scriptname[len - 1] = '\"';
@@ -395,7 +396,17 @@ bool execute_script(const char *name, char **envp)
 
 	free(scriptname);
 
-	/* Unset environment? */
+	/* Unset environment */
+
+	for(i = 0; envp[i]; i++) {
+		char *e = strchr(envp[i], '=');
+		if(e) {
+			p = alloca(e - envp[i] + 1);
+			strncpy(p, envp[i], e - envp[i]);
+			p[e - envp[i]] = '\0';
+			putenv(p);
+		}
+	}
 
 #ifdef WEXITSTATUS
 	if(status != -1) {