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

Rename warning/fatal -> sudo_warn/sudo_fatal to avoid namespace

Browse Source 
pollution in libsudo_util.so.
This commit is contained in:
Todd C. Miller
2014-06-27 09:30:52 -06:00
parent d36846a699
commit aecef4aa1d
59 changed files with 729 additions and 729 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
plugins/sudoers/defaults.c
View File

@@ -207,7 +207,7 @@ set_default(char *var, char *val, int op)
break;
}
if (!cur->name) {
warningx(U_("unknown defaults entry `%s'"), var);
sudo_warnx(U_("unknown defaults entry `%s'"), var);
debug_return_bool(false);
}
@@ -215,20 +215,20 @@ set_default(char *var, char *val, int op)
case T_LOGFAC:
if (!store_syslogfac(val, cur, op)) {
if (val)
warningx(U_("value `%s' is invalid for option `%s'"),
sudo_warnx(U_("value `%s' is invalid for option `%s'"),
val, var);
else
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
break;
case T_LOGPRI:
if (!store_syslogpri(val, cur, op)) {
if (val)
warningx(U_("value `%s' is invalid for option `%s'"),
sudo_warnx(U_("value `%s' is invalid for option `%s'"),
val, var);
else
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
break;
@@ -236,16 +236,16 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (ISSET(cur->type, T_PATH) && val && *val != '/') {
warningx(U_("values for `%s' must start with a '/'"), var);
sudo_warnx(U_("values for `%s' must start with a '/'"), var);
debug_return_bool(false);
}
if (!store_str(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
@@ -253,12 +253,12 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (!store_int(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
@@ -266,12 +266,12 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (!store_uint(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
@@ -279,12 +279,12 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (!store_float(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
@@ -292,18 +292,18 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (!store_mode(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
case T_FLAG:
if (val) {
warningx(U_("option `%s' does not take a value"), var);
sudo_warnx(U_("option `%s' does not take a value"), var);
debug_return_bool(false);
}
cur->sd_un.flag = op;
@@ -312,22 +312,22 @@ set_default(char *var, char *val, int op)
if (!val) {
/* Check for bogus boolean usage or lack of a value. */
if (!ISSET(cur->type, T_BOOL) || op != false) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
}
if (!store_list(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
case T_TUPLE:
if (!val && !ISSET(cur->type, T_BOOL)) {
warningx(U_("no value specified for `%s'"), var);
sudo_warnx(U_("no value specified for `%s'"), var);
debug_return_bool(false);
}
if (!store_tuple(val, cur, op)) {
warningx(U_("value `%s' is invalid for option `%s'"), val, var);
sudo_warnx(U_("value `%s' is invalid for option `%s'"), val, var);
debug_return_bool(false);
}
break;
@@ -598,7 +598,7 @@ check_defaults(int what, bool quiet)
}
if (cur->name == NULL) {
if (!quiet)
warningx(U_("unknown defaults entry `%s'"), def->var);
sudo_warnx(U_("unknown defaults entry `%s'"), def->var);
rc = false;
}
}