X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincctl.c;h=54816a3de1c0737b4a8db3a6ae649f86436abe12;hb=a3f04cf74463e783eeddd45e998c1d15db0f868a;hp=4803d6c3f56a2290e8f5afeeb8d3e3feab6c03c3;hpb=f6e87ab476a0faf8b124ecaaa27f967d825e6457;p=tinc

diff --git a/src/tincctl.c b/src/tincctl.c
index 4803d6c3..54816a3d 100644
--- a/src/tincctl.c
+++ b/src/tincctl.c
@@ -748,6 +748,14 @@ static bool remove_service(void) {
 		return false;
 	}
 
+	if(service) {
+		CloseServiceHandle(service);
+	}
+
+	if(manager) {
+		CloseServiceHandle(manager);
+	}
+
 	fprintf(stderr, "%s service removed\n", identname);
 
 	return true;
@@ -842,7 +850,7 @@ bool connect_tincd(bool verbose) {
 
 	if(getaddrinfo(host, port, &hints, &res) || !res) {
 		if(verbose) {
-			fprintf(stderr, "Cannot resolve %s port %s: %s", host, port, sockstrerror(sockerrno));
+			fprintf(stderr, "Cannot resolve %s port %s: %s\n", host, port, sockstrerror(sockerrno));
 		}
 
 		return false;
@@ -863,7 +871,7 @@ bool connect_tincd(bool verbose) {
 
 	if(ioctlsocket(fd, FIONBIO, &arg) != 0) {
 		if(verbose) {
-			fprintf(stderr, "ioctlsocket failed: %s", sockstrerror(sockerrno));
+			fprintf(stderr, "System call `%s' failed: %s\n", "ioctlsocket", sockstrerror(sockerrno));
 		}
 	}
 
@@ -1013,7 +1021,7 @@ static int cmd_start(int argc, char *argv[]) {
 #endif
 
 	// Pass all log messages from the umbilical to stderr.
-	// A nul-byte right before closure means tincd started succesfully.
+	// A nul-byte right before closure means tincd started successfully.
 	bool failure = true;
 	char buf[1024];
 	ssize_t len;
@@ -1157,7 +1165,7 @@ static int dump_invitations(void) {
 		buf[0] = 0;
 
 		if(!fgets(buf, sizeof(buf), f)) {
-			fprintf(stderr, "Invalid invitation file %s", fname);
+			fprintf(stderr, "Invalid invitation file %s\n", fname);
 			fclose(f);
 			continue;
 		}
@@ -1171,7 +1179,7 @@ static int dump_invitations(void) {
 		}
 
 		if(strncmp(buf, "Name = ", 7) || !check_id(buf + 7)) {
-			fprintf(stderr, "Invalid invitation file %s", fname);
+			fprintf(stderr, "Invalid invitation file %s\n", fname);
 			continue;
 		}
 
@@ -1859,7 +1867,7 @@ static int cmd_config(int argc, char *argv[]) {
 			}
 		}
 
-		/* Change "add" into "set" for variables that do not allow multiple occurences.
+		/* Change "add" into "set" for variables that do not allow multiple occurrences.
 		   Turn on warnings when it seems variables might be removed unintentionally. */
 
 		if(action == 1 && !(variables[i].type & VAR_MULTIPLE)) {