rename sockaddr_un variables from 'sun' to the more common 'sa'.

This avoids a namespace conflict with Solaris build environments.

discussed with deraadt@ and kettenis@

diff --git a/usr.sbin/ntpd/control.c b/usr.sbin/ntpd/control.c
index 88dc791..e5af00f 100644 (file)
--- a/usr.sbin/ntpd/control.c
+++ b/usr.sbin/ntpd/control.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: control.c,v 1.2 2013/11/13 20:44:39 benno Exp $ */
+/*     $OpenBSD: control.c,v 1.3 2015/01/04 01:24:43 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -36,7 +36,7 @@
 int
 control_init(char *path)
 {
-       struct sockaddr_un       sun;
+       struct sockaddr_un       sa;
        int                      fd;
        mode_t                   old_umask;
 
@@ -45,10 +45,10 @@ control_init(char *path)
                return (-1);
        }
 
-       bzero(&sun, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       if (strlcpy(sun.sun_path, path, sizeof(sun.sun_path)) >=
-           sizeof(sun.sun_path))
+       bzero(&sa, sizeof(sa));
+       sa.sun_family = AF_UNIX;
+       if (strlcpy(sa.sun_path, path, sizeof(sa.sun_path)) >=
+           sizeof(sa.sun_path))
                errx(1, "ctl socket name too long");
 
        if (unlink(path) == -1)
@@ -59,7 +59,7 @@ control_init(char *path)
                }
 
        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 *)&sa, sizeof(sa)) == -1) {
                log_warn("control_init: bind: %s", path);
                close(fd);
                umask(old_umask);
@@ -108,12 +108,12 @@ control_accept(int listenfd)
 {
        int                      connfd;
        socklen_t                len;
-       struct sockaddr_un       sun;
+       struct sockaddr_un       sa;
        struct ctl_conn         *ctl_conn;
 
-       len = sizeof(sun);
+       len = sizeof(sa);
        if ((connfd = accept(listenfd,
-           (struct sockaddr *)&sun, &len)) == -1) {
+           (struct sockaddr *)&sa, &len)) == -1) {
                if (errno != EWOULDBLOCK && errno != EINTR)
                        log_warn("control_accept: accept");
                return (0);

diff --git a/usr.sbin/ntpd/ntpd.c b/usr.sbin/ntpd/ntpd.c
index 36823f6..519b0c6 100644 (file)
--- a/usr.sbin/ntpd/ntpd.c
+++ b/usr.sbin/ntpd/ntpd.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ntpd.c,v 1.80 2015/01/04 01:11:24 bcook Exp $ */
+/*     $OpenBSD: ntpd.c,v 1.81 2015/01/04 01:24:43 bcook Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -527,7 +527,7 @@ writefreq(double d)
 void
 ctl_main(int argc, char *argv[])
 {
-       struct sockaddr_un       sun;
+       struct sockaddr_un       sa;
        struct imsg              imsg;
        struct imsgbuf          *ibuf_ctl;
        int                      fd, n, done, ch, action;
@@ -580,12 +580,12 @@ ctl_main(int argc, char *argv[])
        if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
                err(1, "ntpctl: socket");
 
-       bzero(&sun, sizeof(sun));
-       sun.sun_family = AF_UNIX;
-       if (strlcpy(sun.sun_path, sockname, sizeof(sun.sun_path)) >=
-           sizeof(sun.sun_path))
+       bzero(&sa, sizeof(sa));
+       sa.sun_family = AF_UNIX;
+       if (strlcpy(sa.sun_path, sockname, sizeof(sa.sun_path)) >=
+           sizeof(sa.sun_path))
                errx(1, "ctl socket name too long");
-       if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1)
+       if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1)
                err(1, "connect: %s", sockname);
 
        if ((ibuf_ctl = malloc(sizeof(struct imsgbuf))) == NULL)