X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=e6b108f5ab10e68b9c2d6acf61daf7e869dff6dc;hb=708825e4b229a4a1e182e682e2d1021fa2765396;hp=77454f755d05dc46481ee8cf7ca735d407302e90;hpb=a22041922f160667573e9a5ae3f4195e1668906a;p=tinc

diff --git a/src/process.c b/src/process.c
index 77454f75..e6b108f5 100644
--- a/src/process.c
+++ b/src/process.c
@@ -166,7 +166,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	event_loopexit(NULL);
+	abort();
 	status.dwWaitHint = 30000; 
 	status.dwCurrentState = SERVICE_STOP_PENDING; 
 	SetServiceStatus(statushandle, &status);
@@ -263,7 +263,7 @@ bool detach(void) {
 bool execute_script(const char *name, char **envp) {
 #ifdef HAVE_SYSTEM
 	int status, len;
-	char *scriptname, *p;
+	char *scriptname;
 	int i;
 
 #ifndef HAVE_MINGW
@@ -304,7 +304,7 @@ bool execute_script(const char *name, char **envp) {
 	for(i = 0; envp[i]; i++) {
 		char *e = strchr(envp[i], '=');
 		if(e) {
-			p = alloca(e - envp[i] + 1);
+			char p[e - envp[i] + 1];
 			strncpy(p, envp[i], e - envp[i]);
 			p[e - envp[i]] = '\0';
 			putenv(p);
@@ -342,6 +342,14 @@ bool execute_script(const char *name, char **envp) {
 */
 
 #ifndef HAVE_MINGW
+static RETSIGTYPE sigterm_handler(int a) {
+	logger(LOG_NOTICE, "Got %s signal", "TERM");
+	if(running)
+		running = false;
+	else
+		exit(1);
+}
+
 static RETSIGTYPE fatal_signal_square(int a) {
 	logger(LOG_ERR, "Got another fatal signal %d (%s): not restarting.", a,
 		   strsignal(a));
@@ -382,11 +390,15 @@ static struct {
 	int signal;
 	void (*handler)(int);
 } sighandlers[] = {
+	{SIGTERM, sigterm_handler},
+	{SIGQUIT, sigterm_handler},
+	{SIGINT, sigterm_handler},
 	{SIGSEGV, fatal_signal_handler},
 	{SIGBUS, fatal_signal_handler},
 	{SIGILL, fatal_signal_handler},
 	{SIGPIPE, ignore_signal_handler},
 	{SIGCHLD, ignore_signal_handler},
+	{SIGALRM, ignore_signal_handler},
 	{0, NULL}
 };
 #endif