From: dtucker@openbsd.org Date: Wed, 7 May 2025 10:44:26 +0000 (+0000) Subject: upstream: Rename sockaddr_un sun -> sunaddr. X-Git-Tag: V_10_1_P1~308 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=207289a5663bdf49903e1aeb938dcc0924e2ac63;p=thirdparty%2Fopenssh-portable.git upstream: Rename sockaddr_un sun -> sunaddr. This makes things easier in -portable, where on Solaris an derivatives "sun" is defined to "1", causing compilation errors. ok deraadt@. OpenBSD-Commit-ID: 0669043afb49856b57b382f0489221bd98305d3b --- diff --git a/misc-agent.c b/misc-agent.c index 9d96880e9..34ce2a524 100644 --- a/misc-agent.c +++ b/misc-agent.c @@ -226,14 +226,14 @@ static int socket_is_stale(const char *path) { int fd, r; - struct sockaddr_un sun; + struct sockaddr_un sunaddr; socklen_t l = sizeof(r); /* attempt non-blocking connect on socket */ - memset(&sun, '\0', sizeof(sun)); - sun.sun_family = AF_UNIX; - if (strlcpy(sun.sun_path, path, - sizeof(sun.sun_path)) >= sizeof(sun.sun_path)) { + memset(&sunaddr, '\0', sizeof(sunaddr)); + sunaddr.sun_family = AF_UNIX; + if (strlcpy(sunaddr.sun_path, path, + sizeof(sunaddr.sun_path)) >= sizeof(sunaddr.sun_path)) { debug_f("path for \"%s\" too long for sockaddr_un", path); return 0; } @@ -243,7 +243,7 @@ socket_is_stale(const char *path) } set_nonblock(fd); /* a socket without a listener should yield an error immediately */ - if (connect(fd, (struct sockaddr *)&sun, sizeof(sun)) == -1) { + if (connect(fd, (struct sockaddr *)&sunaddr, sizeof(sunaddr)) == -1) { debug_f("connect \"%s\": %s", path, strerror(errno)); close(fd); return 1;