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

Replace or remove use of `scare quotes'

Browse Source 
These don't translate well and look odd in many fonts.
This commit is contained in:
Todd C. Miller
2020-06-24 05:40:18 -06:00
parent 95ba6645d2
commit df49897bd0
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/def_data.c
View File

@@ -275,7 +275,7 @@ struct sudo_defs_types sudo_defs_table[] = {
NULL, NULL,
}, { }, {
"closefrom_override", T_FLAG, "closefrom_override", T_FLAG,
N_("If set, users may override the value of `closefrom' with the -C option"), N_("If set, users may override the value of \"closefrom\" with the -C option"),
NULL, NULL,
}, { }, {
"setenv", T_FLAG, "setenv", T_FLAG,

2
plugins/sudoers/def_data.in
View File

@@ -192,7 +192,7 @@ closefrom
"File descriptors >= %d will be closed before executing a command" "File descriptors >= %d will be closed before executing a command"
closefrom_override closefrom_override
T_FLAG T_FLAG
"If set, users may override the value of `closefrom' with the -C option" "If set, users may override the value of "closefrom" with the -C option"
setenv setenv
T_FLAG T_FLAG
"Allow users to set arbitrary environment variables" "Allow users to set arbitrary environment variables"

10
src/parse_args.c
View File

@@ -529,11 +529,11 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
if (ISSET(flags, MODE_LOGIN_SHELL)) { if (ISSET(flags, MODE_LOGIN_SHELL)) {
if (ISSET(flags, MODE_SHELL)) { if (ISSET(flags, MODE_SHELL)) {
sudo_warnx(U_("you may not specify both the `-i' and `-s' options")); sudo_warnx(U_("you may not specify both the -i and -s options"));
usage(); usage();
} }
if (ISSET(flags, MODE_PRESERVE_ENV)) { if (ISSET(flags, MODE_PRESERVE_ENV)) {
sudo_warnx(U_("you may not specify both the `-i' and `-E' options")); sudo_warnx(U_("you may not specify both the -i and -E options"));
usage(); usage();
} }
SET(flags, MODE_SHELL); SET(flags, MODE_SHELL);
@@ -543,7 +543,7 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
if (mode == MODE_EDIT && if (mode == MODE_EDIT &&
(ISSET(flags, MODE_PRESERVE_ENV) || extra_env.env_len != 0)) { (ISSET(flags, MODE_PRESERVE_ENV) || extra_env.env_len != 0)) {
if (ISSET(mode, MODE_PRESERVE_ENV)) if (ISSET(mode, MODE_PRESERVE_ENV))
sudo_warnx(U_("the `-E' option is not valid in edit mode")); sudo_warnx(U_("the -E option is not valid in edit mode"));
if (extra_env.env_len != 0) if (extra_env.env_len != 0)
sudo_warnx(U_("you may not specify environment variables in edit mode")); sudo_warnx(U_("you may not specify environment variables in edit mode"));
usage(); usage();
@@ -554,11 +554,11 @@ parse_args(int argc, char **argv, int *old_optind, int *nargc, char ***nargv,
usage(); usage();
} }
if (list_user != NULL && mode != MODE_LIST && mode != MODE_CHECK) { if (list_user != NULL && mode != MODE_LIST && mode != MODE_CHECK) {
sudo_warnx(U_("the `-U' option may only be used with the `-l' option")); sudo_warnx(U_("the -U option may only be used with the -l option"));
usage(); usage();
} }
if (ISSET(tgetpass_flags, TGP_STDIN) && ISSET(tgetpass_flags, TGP_ASKPASS)) { if (ISSET(tgetpass_flags, TGP_STDIN) && ISSET(tgetpass_flags, TGP_ASKPASS)) {
sudo_warnx(U_("the `-A' and `-S' options may not be used together")); sudo_warnx(U_("the -A and -S options may not be used together"));
usage(); usage();
} }
if ((argc == 0 && mode == MODE_EDIT) || if ((argc == 0 && mode == MODE_EDIT) ||

2
src/sudo.c
View File

@@ -1155,7 +1155,7 @@ policy_check(int argc, char * const argv[],
debug_decl(policy_check, SUDO_DEBUG_PCOMM); debug_decl(policy_check, SUDO_DEBUG_PCOMM);
if (policy_plugin.u.policy->check_policy == NULL) { if (policy_plugin.u.policy->check_policy == NULL) {
sudo_fatalx(U_("policy plugin %s is missing the `check_policy' method"), sudo_fatalx(U_("policy plugin %s is missing the \"check_policy\" method"),
policy_plugin.name); policy_plugin.name);
} }
sudo_debug_set_active_instance(policy_plugin.debug_instance); sudo_debug_set_active_instance(policy_plugin.debug_instance);