X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=d08f70ffd0a029ae525873ff74f996d90cd5ab6a;hp=0ec98802342f531463c328909fa5520ab3dd4d48;hb=ae070b917066f612e9aba8611c7a5da88e19a51a;hpb=9bde92ce97d5503ff2d31dcc6f0648902580ec14

diff --git a/src/process.c b/src/process.c
index 0ec98802..d08f70ff 100644
--- a/src/process.c
+++ b/src/process.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.69 2003/08/08 22:11:54 guus Exp $
+    $Id: process.c,v 1.1.2.71 2003/08/10 13:35:05 guus Exp $
 */
 
 #include "system.h"
@@ -85,6 +85,7 @@ bool install_service(void) {
 	char command[4096] = "";
 	char **argp;
 	bool space;
+	SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 	if(!manager) {
@@ -120,6 +121,8 @@ bool install_service(void) {
 		return false;
 	}
 
+	ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
 	logger(LOG_INFO, _("%s service installed"), identname);
 
 	if(!StartService(service, 0, NULL))
@@ -365,15 +368,17 @@ bool execute_script(const char *name, char **envp)
 
 	cp();
 
-	asprintf(&scriptname, "\"%s/%s\"", confbase, name);
-
 #ifndef HAVE_MINGW
+	asprintf(&scriptname, "%s/%s", confbase, name);
+
 	/* First check if there is a script */
 
 	if(stat(scriptname, &s))
 		return true;
 
 	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+	free(scriptname);
 #endif
 
 #ifdef HAVE_PUTENV
@@ -383,6 +388,7 @@ bool execute_script(const char *name, char **envp)
 		putenv(*envp++);
 #endif
 
+	asprintf(&scriptname, "\"%s/%s\"", confbase, name);
 	status = system(scriptname);
 
 	free(scriptname);