From ff50f20d0a61bdc2bf4c7be91a94f343e109107d Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Wed, 31 Dec 2014 22:26:16 -0600
Subject: [PATCH] add Solaris build patch

---
 ...ocket-to-avoid-a-variable-called-sun.patch | 98 +++++++++++++++++++
 1 file changed, 98 insertions(+)
 create mode 100644 patches/0013-rename-socket-to-avoid-a-variable-called-sun.patch

diff --git a/patches/0013-rename-socket-to-avoid-a-variable-called-sun.patch b/patches/0013-rename-socket-to-avoid-a-variable-called-sun.patch
new file mode 100644
index 0000000..4ccb5a9
--- /dev/null
+++ b/patches/0013-rename-socket-to-avoid-a-variable-called-sun.patch
@@ -0,0 +1,98 @@
+From 4283830eb8ae4cc1919271bb11f452d87c717b73 Mon Sep 17 00:00:00 2001
+From: Brent Cook <busterb@gmail.com>
+Date: Wed, 31 Dec 2014 22:08:09 -0600
+Subject: [PATCH 13/13] rename socket to avoid a variable called 'sun'
+
+Solaris defines 'sun' as a constant.
+---
+ src/usr.sbin/ntpd/control.c | 18 +++++++++---------
+ src/usr.sbin/ntpd/ntpd.c    | 12 ++++++------
+ 2 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/src/usr.sbin/ntpd/control.c b/src/usr.sbin/ntpd/control.c
+index 6c5b05d..eb3575b 100644
+--- a/src/usr.sbin/ntpd/control.c
++++ b/src/usr.sbin/ntpd/control.c
+@@ -36,7 +36,7 @@
+ int
+ control_init(char *path)
+ {
+-	struct sockaddr_un	 sun;
++	struct sockaddr_un	 sock;
+ 	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(&sock, sizeof(sock));
++	sock.sun_family = AF_UNIX;
++	if (strlcpy(sock.sun_path, path, sizeof(sock.sun_path)) >=
++	    sizeof(sock.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 *)&sock, sizeof(sock)) == -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	 sock;
+ 	struct ctl_conn		*ctl_conn;
+ 
+-	len = sizeof(sun);
++	len = sizeof(sock);
+ 	if ((connfd = accept(listenfd,
+-	    (struct sockaddr *)&sun, &len)) == -1) {
++	    (struct sockaddr *)&sock, &len)) == -1) {
+ 		if (errno != EWOULDBLOCK && errno != EINTR)
+ 			log_warn("control_accept: accept");
+ 		return (0);
+diff --git a/src/usr.sbin/ntpd/ntpd.c b/src/usr.sbin/ntpd/ntpd.c
+index b45f4ca..b6b3663 100644
+--- a/src/usr.sbin/ntpd/ntpd.c
++++ b/src/usr.sbin/ntpd/ntpd.c
+@@ -554,7 +554,7 @@ writefreq(double d)
+ void
+ ctl_main(int argc, char *argv[])
+ {
+-	struct sockaddr_un	 sun;
++	struct sockaddr_un	 sock;
+ 	struct imsg		 imsg;
+ 	struct imsgbuf		*ibuf_ctl;
+ 	int			 fd, n, done, ch, action;
+@@ -607,12 +607,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(&sock, sizeof(sock));
++	sock.sun_family = AF_UNIX;
++	if (strlcpy(sock.sun_path, sockname, sizeof(sock.sun_path)) >=
++	    sizeof(sock.sun_path))
+ 		errx(1, "ctl socket name too long");
+-	if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1)
++	if (connect(fd, (struct sockaddr *)&sock, sizeof(sock)) == -1)
+ 		err(1, "connect: %s", sockname);
+ 
+ 	if ((ibuf_ctl = malloc(sizeof(struct imsgbuf))) == NULL)
+-- 
+1.9.1
+