diff options
| author | Renato Westphal <renato@opensourcerouting.org> | 2016-03-29 16:37:01 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-23 15:31:06 +0200 |
| commit | e30090a678e45aee2755c492212c5a478b9dcfcc (patch) | |
| tree | 822da3c0a65fe434e341148c96a43e3ef48f7a39 /ldpd/control.c | |
| parent | ldpd: copy original sources from OpenBSD (14/09/2016) (diff) | |
| download | frr-e30090a678e45aee2755c492212c5a478b9dcfcc.tar.xz frr-e30090a678e45aee2755c492212c5a478b9dcfcc.zip | |
ldpd: sun is a reserved word on Solaris
On a SUN/Solaris system the string "sun" is a preprocessor define and
can't be used for program variables.
Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
Diffstat (limited to 'ldpd/control.c')
| -rw-r--r-- | ldpd/control.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ldpd/control.c b/ldpd/control.c index 42322eb08..b7cb3f106 100644 --- a/ldpd/control.c +++ b/ldpd/control.c @@ -44,7 +44,7 @@ static int control_fd; int control_init(void) { - struct sockaddr_un sun; + struct sockaddr_un s_un; int fd; mode_t old_umask; @@ -54,9 +54,9 @@ control_init(void) return (-1); } - memset(&sun, 0, sizeof(sun)); - sun.sun_family = AF_UNIX; - strlcpy(sun.sun_path, LDPD_SOCKET, sizeof(sun.sun_path)); + memset(&s_un, 0, sizeof(s_un)); + s_un.sun_family = AF_UNIX; + strlcpy(s_un.sun_path, LDPD_SOCKET, sizeof(s_un.sun_path)); if (unlink(LDPD_SOCKET) == -1) if (errno != ENOENT) { @@ -66,7 +66,7 @@ control_init(void) } old_umask = umask(S_IXUSR|S_IXGRP|S_IWOTH|S_IROTH|S_IXOTH); - if (bind(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1) { + if (bind(fd, (struct sockaddr *)&s_un, sizeof(s_un)) == -1) { log_warn("%s: bind: %s", __func__, LDPD_SOCKET); close(fd); umask(old_umask); @@ -111,11 +111,11 @@ control_accept(int listenfd, short event, void *bula) { int connfd; socklen_t len; - struct sockaddr_un sun; + struct sockaddr_un s_un; struct ctl_conn *c; - len = sizeof(sun); - if ((connfd = accept4(listenfd, (struct sockaddr *)&sun, &len, + len = sizeof(s_un); + if ((connfd = accept4(listenfd, (struct sockaddr *)&s_un, &len, SOCK_NONBLOCK | SOCK_CLOEXEC)) == -1) { /* * Pause accept if we are out of file descriptors, or |