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

Make sudo pass -Wwrite-strings

Browse Source
This commit is contained in:
Todd C. Miller
2022-06-28 16:33:15 -06:00
parent b3a8cad346
commit 13672f28df
77 changed files with 590 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
plugins/sudoers/log_client.c
View File

@@ -766,7 +766,7 @@ fmt_client_hello(struct client_closure *closure)
sudo_debug_printf(SUDO_DEBUG_INFO, "%s: sending ClientHello", __func__);
/* Client name + version */
hello_msg.client_id = "sudoers " PACKAGE_VERSION;
hello_msg.client_id = (char *)"sudoers " PACKAGE_VERSION;
/* Schedule ClientMessage */
client_msg.u.hello_msg = &hello_msg;
@@ -840,6 +840,27 @@ fmt_info_messages(struct client_closure *closure, struct eventlog *evlog,
info_message__init(info_msgs[n]);
}
#define fill_str(_n, _v) do { \
info_msgs[n]->key = (char *)(_n); \
info_msgs[n]->u.strval = (_v); \
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL; \
n++; \
} while (0)
#define fill_strlist(_n, _v) do { \
info_msgs[n]->key = (char *)(_n); \
info_msgs[n]->u.strlistval = (_v); \
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRLISTVAL; \
n++; \
} while (0)
#define fill_num(_n, _v) do { \
info_msgs[n]->key = (char *)(_n); \
info_msgs[n]->u.numval = (_v); \
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_NUMVAL; \
n++; \
} while (0)
/* Fill in info_msgs */
n = 0;
@@ -847,106 +868,43 @@ fmt_info_messages(struct client_closure *closure, struct eventlog *evlog,
/* TODO: clientpid */
/* TODO: clientppid */
/* TODO: clientsid */
info_msgs[n]->key = "columns";
info_msgs[n]->u.numval = evlog->columns;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_NUMVAL;
n++;
info_msgs[n]->key = "command";
info_msgs[n]->u.strval = evlog->command;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
info_msgs[n]->key = "lines";
info_msgs[n]->u.numval = evlog->lines;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_NUMVAL;
n++;
fill_num("columns", evlog->columns);
fill_str("command", evlog->command);
fill_num("lines", evlog->lines);
if (runargv != NULL) {
info_msgs[n]->key = "runargv";
info_msgs[n]->u.strlistval = runargv;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRLISTVAL;
n++;
fill_strlist("runargv", runargv);
runargv = NULL;
}
if (evlog->runchroot != NULL) {
fill_str("runchroot", evlog->runchroot);
}
if (evlog->runcwd != NULL) {
fill_str("runcwd", evlog->runcwd);
}
if (runenv != NULL) {
info_msgs[n]->key = "runenv";
info_msgs[n]->u.strlistval = runenv;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRLISTVAL;
n++;
fill_strlist("runenv", runenv);
runenv = NULL;
}
if (evlog->rungroup != NULL) {
info_msgs[n]->key = "rungid";
info_msgs[n]->u.numval = evlog->rungid;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_NUMVAL;
n++;
info_msgs[n]->key = "rungroup";
info_msgs[n]->u.strval = evlog->rungroup;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
fill_num("rungid", evlog->rungid);
fill_str("rungroup", evlog->rungroup);
}
/* TODO - rungids */
/* TODO - rungroups */
info_msgs[n]->key = "runuid";
info_msgs[n]->u.numval = evlog->runuid;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_NUMVAL;
n++;
info_msgs[n]->key = "runuser";
info_msgs[n]->u.strval = evlog->runuser;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
fill_num("runuid", evlog->runuid);
fill_str("runuser", evlog->runuser);
if (evlog->cwd != NULL) {
info_msgs[n]->key = "submitcwd";
info_msgs[n]->u.strval = evlog->cwd;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
fill_str("submitcwd", evlog->cwd);
}
if (evlog->runcwd != NULL) {
info_msgs[n]->key = "runcwd";
info_msgs[n]->u.strval = evlog->runcwd;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
}
if (evlog->runchroot != NULL) {
info_msgs[n]->key = "runchroot";
info_msgs[n]->u.strval = evlog->runchroot;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
}
/* TODO - submitenv */
/* TODO - submitgid */
/* TODO - submitgids */
/* TODO - submitgroup */
/* TODO - submitgroups */
info_msgs[n]->key = "submithost";
info_msgs[n]->u.strval = evlog->submithost;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
fill_str("submithost", evlog->submithost);
/* TODO - submituid */
info_msgs[n]->key = "submituser";
info_msgs[n]->u.strval = evlog->submituser;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
if (evlog->ttyname != NULL) {
info_msgs[n]->key = "ttyname";
info_msgs[n]->u.strval = evlog->ttyname;
info_msgs[n]->value_case = INFO_MESSAGE__VALUE_STRVAL;
n++;
}
fill_str("submituser", evlog->submituser);
fill_str("ttyname", evlog->ttyname);
/* Free unused structs. */
while (info_msgs_size > n)