mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-23 02:17:35 +00:00
Code Issues Releases Wiki Activity

Rename sa_len -> sa_size to avoid a conflict on UnixWare and others.

Browse Source 
On some systems, sa_len is a #define for 4.4BSD compatibility.
This commit is contained in:
Todd C. Miller 2020-09-04 16:06:37 -06:00
parent f6a14c9414
commit e92d10011e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
logsrvd/logsrvd.c
View File

@ -1565,7 +1565,7 @@ create_listener(struct listen_address *addr)
#endif #endif
if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1) if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) == -1)
sudo_warn("SO_REUSEADDR"); sudo_warn("SO_REUSEADDR");
if (bind(sock, &addr->sa_un.sa, addr->sa_len) == -1) { if (bind(sock, &addr->sa_un.sa, addr->sa_size) == -1) {
/* TODO: only warn once for IPv4 and IPv6 or disambiguate */ /* TODO: only warn once for IPv4 and IPv6 or disambiguate */
sudo_warn("%s (%s)", addr->sa_str, family); sudo_warn("%s (%s)", addr->sa_str, family);
goto bad; goto bad;

2
logsrvd/logsrvd.h
View File

@ -131,7 +131,7 @@ struct listen_address {
TAILQ_ENTRY(listen_address) entries; TAILQ_ENTRY(listen_address) entries;
char *sa_str; char *sa_str;
union sockaddr_union sa_un; union sockaddr_union sa_un;
socklen_t sa_len; socklen_t sa_size;
bool tls; bool tls;
}; };
TAILQ_HEAD(listen_address_list, listen_address); TAILQ_HEAD(listen_address_list, listen_address);

2
logsrvd/logsrvd_conf.c
View File

@ -418,7 +418,7 @@ cb_listen_address(struct logsrvd_config *config, const char *str)
goto done; goto done;
} }
memcpy(&addr->sa_un, res->ai_addr, res->ai_addrlen); memcpy(&addr->sa_un, res->ai_addr, res->ai_addrlen);
addr->sa_len = res->ai_addrlen; addr->sa_size = res->ai_addrlen;
addr->tls = tls; addr->tls = tls;
TAILQ_INSERT_TAIL(&config->server.addresses, addr, entries); TAILQ_INSERT_TAIL(&config->server.addresses, addr, entries);
} }