X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fcontrol.c;h=456274956dd3d07883b1c3dee24b84bc796e79a2;hp=1f562134d4f7517d8e2c8a1dd71a3a1817758844;hb=cf9bea4e938f4eec531782e2e947d711cac16014;hpb=b180c1af99c559809d0e7b23fce3022817ec56a9

diff --git a/src/control.c b/src/control.c
index 1f562134..45627495 100644
--- a/src/control.c
+++ b/src/control.c
@@ -182,11 +182,11 @@ bool init_control(void) {
 		return false;
 	}
 
-	struct sockaddr_un sun;
-	sun.sun_family = AF_UNIX;
-	strncpy(sun.sun_path, unixsocketname, sizeof sun.sun_path);
+	struct sockaddr_un sa_un;
+	sa_un.sun_family = AF_UNIX;
+	strncpy(sa_un.sun_path, unixsocketname, sizeof sa_un.sun_path);
 
-	if(connect(unix_fd, (struct sockaddr *)&sun, sizeof sun) >= 0) {
+	if(connect(unix_fd, (struct sockaddr *)&sa_un, sizeof sa_un) >= 0) {
 		logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
 		return false;
 	}
@@ -194,7 +194,7 @@ bool init_control(void) {
 	unlink(unixsocketname);
 
 	umask(mask | 077);
-	int result = bind(unix_fd, (struct sockaddr *)&sun, sizeof sun);
+	int result = bind(unix_fd, (struct sockaddr *)&sa_un, sizeof sa_un);
 	umask(mask);
 
 	if(result < 0) {
@@ -215,6 +215,7 @@ bool init_control(void) {
 
 void exit_control(void) {
 #ifndef HAVE_MINGW
+	unlink(unixsocketname);
 	io_del(&unix_socket);
 	close(unix_socket.fd);
 #endif