j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Avoid using a variable named "sun". Solaris doesn't like it.

Browse source
This commit is contained in:
Guus Sliepen 2013-12-07 22:39:24 +01:00
parent 221f559bcf
commit cf9bea4e93
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/control.c
View file

@ -182,11 +182,11 @@ bool init_control(void) {
return false; return false;
} }
struct sockaddr_un sun; struct sockaddr_un sa_un;
sun.sun_family = AF_UNIX; sa_un.sun_family = AF_UNIX;
strncpy(sun.sun_path, unixsocketname, sizeof sun.sun_path); 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); logger(DEBUG_ALWAYS, LOG_ERR, "UNIX socket %s is still in use!", unixsocketname);
return false; return false;
} }
@ -194,7 +194,7 @@ bool init_control(void) {
unlink(unixsocketname); unlink(unixsocketname);
umask(mask | 077); 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); umask(mask);
if(result < 0) { if(result < 0) {