isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid a -Wshadow warning on Solaris 9.

Browse Source
This commit is contained in:
Todd C. Miller
2022-10-07 11:00:17 -06:00
parent 0eb136d65c
commit 57b5ff8e8c
17 changed files with 383 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/env_hooks.c
View File

@@ -57,7 +57,9 @@ getenv_unhooked(const char *name)
return val;
}
sudo_dso_public char *
sudo_dso_public char *getenv(const char *name);
char *
getenv(const char *name)
{
char *val = NULL;
@@ -143,7 +145,9 @@ putenv_unhooked(PUTENV_CONST char *string)
return rpl_putenv(string);
}
sudo_dso_public int
sudo_dso_public int putenv(PUTENV_CONST char *string);
int
putenv(PUTENV_CONST char *string)
{
switch (process_hooks_putenv((char *)string)) {
@@ -215,7 +219,9 @@ setenv_unhooked(const char *var, const char *val, int overwrite)
return rpl_setenv(var, val, overwrite);
}
sudo_dso_public int
sudo_dso_public int setenv(const char *var, const char *val, int overwrite);
int
setenv(const char *var, const char *val, int overwrite)
{
switch (process_hooks_setenv(var, val, overwrite)) {
@@ -280,10 +286,14 @@ unsetenv_unhooked(const char *var)
}
#ifdef UNSETENV_VOID
sudo_dso_public void
# define UNSETENV_RTYPE void
#else
sudo_dso_public int
# define UNSETENV_RTYPE int
#endif
sudo_dso_public UNSETENV_RTYPE unsetenv(const char *var);
UNSETENV_RTYPE
unsetenv(const char *var)
{
int ret;

24
src/exec_intercept.c
View File

@@ -218,8 +218,8 @@ intercept_cleanup(void)
static bool
prepare_listener(struct intercept_closure *closure)
{
struct sockaddr_in sin;
socklen_t sin_len = sizeof(sin);
struct sockaddr_in sin4;
socklen_t sin4_len = sizeof(sin4);
int sock;
debug_decl(prepare_listener, SUDO_DEBUG_EXEC);
@@ -234,15 +234,15 @@ prepare_listener(struct intercept_closure *closure)
sudo_warn("socket");
goto bad;
}
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sin.sin_port = 0;
if (bind(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
memset(&sin4, 0, sizeof(sin4));
sin4.sin_family = AF_INET;
sin4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sin4.sin_port = 0;
if (bind(sock, (struct sockaddr *)&sin4, sizeof(sin4)) == -1) {
sudo_warn("bind");
goto bad;
}
if (getsockname(sock, (struct sockaddr *)&sin, &sin_len) == -1) {
if (getsockname(sock, (struct sockaddr *)&sin4, &sin4_len) == -1) {
sudo_warn("getsockname");
goto bad;
}
@@ -252,7 +252,7 @@ prepare_listener(struct intercept_closure *closure)
}
closure->listen_sock = sock;
intercept_listen_port = ntohs(sin.sin_port);
intercept_listen_port = ntohs(sin4.sin_port);
sudo_debug_printf(SUDO_DEBUG_INFO|SUDO_DEBUG_LINENO,
"%s: listening on port %hu", __func__, intercept_listen_port);
@@ -1012,8 +1012,8 @@ intercept_accept_cb(int fd, int what, void *v)
{
struct intercept_closure *closure = v;
struct sudo_event_base *evbase = sudo_ev_get_base(&closure->ev);
struct sockaddr_in sin;
socklen_t sin_len = sizeof(sin);
struct sockaddr_in sin4;
socklen_t sin4_len = sizeof(sin4);
int client_sock, flags, on = 1;
debug_decl(intercept_accept_cb, SUDO_DEBUG_EXEC);
@@ -1026,7 +1026,7 @@ intercept_accept_cb(int fd, int what, void *v)
debug_return;
}
client_sock = accept(fd, (struct sockaddr *)&sin, &sin_len);
client_sock = accept(fd, (struct sockaddr *)&sin4, &sin4_len);
if (client_sock == -1) {
sudo_warn("accept");
goto bad;

48
src/net_ifs.c
View File

@@ -105,7 +105,7 @@ int
get_net_ifs(char **addrinfo_out)
{
struct ifaddrs *ifa, *ifaddrs;
struct sockaddr_in *sin;
struct sockaddr_in *sin4;
# ifdef HAVE_STRUCT_IN6_ADDR
struct sockaddr_in6 *sin6;
# endif
@@ -156,19 +156,19 @@ get_net_ifs(char **addrinfo_out)
switch (ifa->ifa_addr->sa_family) {
case AF_INET:
sin = (struct sockaddr_in *)ifa->ifa_addr;
if (sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_NONE) {
sin4 = (struct sockaddr_in *)ifa->ifa_addr;
if (sin4->sin_addr.s_addr == INADDR_ANY || sin4->sin_addr.s_addr == INADDR_NONE) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring unspecified AF_INET addr for %s", ifa->ifa_name);
continue;
}
if (inet_ntop(AF_INET, &sin->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
if (inet_ntop(AF_INET, &sin4->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET addr for %s", ifa->ifa_name);
continue;
}
sin = (struct sockaddr_in *)ifa->ifa_netmask;
if (inet_ntop(AF_INET, &sin->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sin4 = (struct sockaddr_in *)ifa->ifa_netmask;
if (inet_ntop(AF_INET, &sin4->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET mask for %s", ifa->ifa_name);
continue;
@@ -315,7 +315,7 @@ get_net_ifs(char **addrinfo_out)
*/
for (i = 0; i < ifconf.ifc_len; ) {
struct ifreq *ifr = (struct ifreq *)&ifconf.ifc_buf[i];
struct sockaddr_in *sin;
struct sockaddr_in *sin4;
/* Set i to the subscript of the next interface (no sa_len). */
i += sizeof(struct ifreq);
@@ -329,13 +329,13 @@ get_net_ifs(char **addrinfo_out)
}
/* Store the address. */
sin = (struct sockaddr_in *)&ifr->ifr_addr;
if (sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_NONE) {
sin4 = (struct sockaddr_in *)&ifr->ifr_addr;
if (sin4->sin_addr.s_addr == INADDR_ANY || sin4->sin_addr.s_addr == INADDR_NONE) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring unspecified AF_INET addr for %s", ifr->ifr_name);
continue;
}
if (inet_ntop(AF_INET, &sin->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
if (inet_ntop(AF_INET, &sin4->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET addr for %s", ifr->ifr_name);
continue;
@@ -359,8 +359,8 @@ get_net_ifs(char **addrinfo_out)
}
/* Convert the mask to string form. */
sin = (struct sockaddr_in *)&ifr->ifr_addr;
if (inet_ntop(AF_INET, &sin->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sin4 = (struct sockaddr_in *)&ifr->ifr_addr;
if (inet_ntop(AF_INET, &sin4->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET mask for %s", ifr->ifr_name);
continue;
@@ -467,7 +467,7 @@ get_net_ifs(char **addrinfo_out)
{
struct lifconf lifconf;
struct lifnum lifn;
struct sockaddr_in *sin;
struct sockaddr_in *sin4;
struct sockaddr_in6 *sin6;
char addrstr[INET6_ADDRSTRLEN], maskstr[INET6_ADDRSTRLEN];
char *addrinfo = NULL;
@@ -540,13 +540,13 @@ get_net_ifs(char **addrinfo_out)
/* Store the address. */
switch (family) {
case AF_INET:
sin = (struct sockaddr_in *)&lifr->lifr_addr;
if (sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_NONE) {
sin4 = (struct sockaddr_in *)&lifr->lifr_addr;
if (sin4->sin_addr.s_addr == INADDR_ANY || sin4->sin_addr.s_addr == INADDR_NONE) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring unspecified AF_INET addr for %s", lifr->lifr_name);
continue;
}
if (inet_ntop(AF_INET, &sin->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
if (inet_ntop(AF_INET, &sin4->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET addr for %s", lifr->lifr_name);
continue;
@@ -592,8 +592,8 @@ get_net_ifs(char **addrinfo_out)
}
switch (family) {
case AF_INET:
sin = (struct sockaddr_in *)&lifr->lifr_addr;
if (inet_ntop(AF_INET, &sin->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sin4 = (struct sockaddr_in *)&lifr->lifr_addr;
if (inet_ntop(AF_INET, &sin4->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET mask for %s", lifr->lifr_name);
continue;
@@ -654,7 +654,7 @@ get_net_ifs(char **addrinfo_out)
{
struct ifconf ifconf;
struct ifreq *ifr;
struct sockaddr_in *sin;
struct sockaddr_in *sin4;
# ifdef HAVE_STRUCT_IN6_ADDR
struct sockaddr_in6 *sin6;
# endif
@@ -768,13 +768,13 @@ get_net_ifs(char **addrinfo_out)
/* Store the address. */
switch (family) {
case AF_INET:
sin = (struct sockaddr_in *)&ifr->ifr_addr;
if (sin->sin_addr.s_addr == INADDR_ANY || sin->sin_addr.s_addr == INADDR_NONE) {
sin4 = (struct sockaddr_in *)&ifr->ifr_addr;
if (sin4->sin_addr.s_addr == INADDR_ANY || sin4->sin_addr.s_addr == INADDR_NONE) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring unspecified AF_INET addr for %s", ifr->ifr_name);
continue;
}
if (inet_ntop(AF_INET, &sin->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
if (inet_ntop(AF_INET, &sin4->sin_addr, addrstr, sizeof(addrstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET addr for %s", ifr->ifr_name);
continue;
@@ -824,8 +824,8 @@ get_net_ifs(char **addrinfo_out)
/* Convert the mask to string form. */
switch (family) {
case AF_INET:
sin = (struct sockaddr_in *)&ifr->ifr_addr;
if (inet_ntop(AF_INET, &sin->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sin4 = (struct sockaddr_in *)&ifr->ifr_addr;
if (inet_ntop(AF_INET, &sin4->sin_addr, maskstr, sizeof(maskstr)) == NULL) {
sudo_debug_printf(SUDO_DEBUG_ERROR|SUDO_DEBUG_LINENO,
"ignoring bad AF_INET mask for %s", ifr->ifr_name);
continue;

12
src/sudo_intercept_common.c
View File

@@ -358,7 +358,7 @@ intercept_connect(void)
{
int sock = -1;
int on = 1;
struct sockaddr_in sin;
struct sockaddr_in sin4;
debug_decl(intercept_connect, SUDO_DEBUG_EXEC);
if (intercept_port == 0) {
@@ -366,10 +366,10 @@ intercept_connect(void)
goto done;
}
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sin.sin_port = htons(intercept_port);
memset(&sin4, 0, sizeof(sin4));
sin4.sin_family = AF_INET;
sin4.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
sin4.sin_port = htons(intercept_port);
sock = socket(AF_INET, SOCK_STREAM, 0);
if (sock == -1) {
@@ -380,7 +380,7 @@ intercept_connect(void)
/* Send data immediately, we need low latency IPC. */
(void)setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, &on, sizeof(on));
if (connect(sock, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
if (connect(sock, (struct sockaddr *)&sin4, sizeof(sin4)) == -1) {
sudo_warn("connect");
close(sock);
sock = -1;

10
src/sudo_plugin_int.h
View File

@@ -38,7 +38,7 @@ struct policy_plugin_1_0 {
unsigned int type;
unsigned int version;
int (*open)(unsigned int version, sudo_conv_1_7_t conversation,
sudo_printf_t sudo_printf, char * const settings[],
sudo_printf_t sudo_plugin_printf, char * const settings[],
char * const user_info[], char * const user_env[]);
void (*close)(int exit_status, int error); /* wait status or error */
int (*show_version)(int verbose);
@@ -46,16 +46,16 @@ struct policy_plugin_1_0 {
char *env_add[], char **command_info[],
char **argv_out[], char **user_env_out[]);
int (*list)(int argc, char * const argv[], int verbose,
const char *list_user);
const char *user);
int (*validate)(void);
void (*invalidate)(int remove);
void (*invalidate)(int rmcred);
int (*init_session)(struct passwd *pwd);
};
struct io_plugin_1_0 {
unsigned int type;
unsigned int version;
int (*open)(unsigned int version, sudo_conv_1_7_t conversation,
sudo_printf_t sudo_printf, char * const settings[],
sudo_printf_t sudo_plugin_printf, char * const settings[],
char * const user_info[], int argc, char * const argv[],
char * const user_env[]);
void (*close)(int exit_status, int error);
@@ -70,7 +70,7 @@ struct io_plugin_1_1 {
unsigned int type;
unsigned int version;
int (*open)(unsigned int version, sudo_conv_1_7_t conversation,
sudo_printf_t sudo_printf, char * const settings[],
sudo_printf_t sudo_plugin_printf, char * const settings[],
char * const user_info[], char * const command_info[],
int argc, char * const argv[], char * const user_env[]);
void (*close)(int exit_status, int error); /* wait status or error */