X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=5ba71613fd4f0cc4529ebddd6f2db0b2b1d938d8;hb=69a18395931d657b77641b68ca12473ad6b996da;hp=1ef7941909c397c3c94132985ba3da7acec987f3;hpb=fa305d9570bc7350d04c7de66cfec28b9a2f53d1;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 1ef79419..5ba71613 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -722,19 +722,20 @@ static bool remove_service(void) {
 	SC_HANDLE manager = NULL;
 	SC_HANDLE service = NULL;
 	SERVICE_STATUS status = {0};
+	bool success = false;
 
 	manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
 
 	if(!manager) {
 		fprintf(stderr, "Could not open service manager: %s\n", winerror(GetLastError()));
-		return false;
+		goto exit;
 	}
 
 	service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 
 	if(!service) {
 		fprintf(stderr, "Could not open %s service: %s\n", identname, winerror(GetLastError()));
-		return false;
+		goto exit;
 	}
 
 	if(!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
@@ -745,15 +746,26 @@ static bool remove_service(void) {
 
 	if(!DeleteService(service)) {
 		fprintf(stderr, "Could not remove %s service: %s\n", identname, winerror(GetLastError()));
-		return false;
+		goto exit;
 	}
-    if(service)
-        CloseServiceHandle(service);
-    if(manager)
-        CloseServiceHandle(manager);
-	fprintf(stderr, "%s service removed\n", identname);
 
-	return true;
+	success = true;
+
+exit:
+
+	if(service) {
+		CloseServiceHandle(service);
+	}
+
+	if(manager) {
+		CloseServiceHandle(manager);
+	}
+
+	if(success) {
+		fprintf(stderr, "%s service removed\n", identname);
+	}
+
+	return success;
 }
 #endif