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

Set the sudoers locale before opening the sudoers file.

Browse Source 
Previously the sudoers locale was used when evaluating sudoers
but not during the inital parse.  Bug #748
This commit is contained in:
Todd C. Miller
2016-06-30 12:40:19 -06:00
parent 5a176e8509
commit 7bfe2e7969
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/sudoers/sudoers.c
View File

@@ -149,7 +149,7 @@ int
sudoers_policy_init(void *info, char * const envp[]) sudoers_policy_init(void *info, char * const envp[])
{ {
struct sudo_nss *nss, *nss_next; struct sudo_nss *nss, *nss_next;
int sources = 0; int oldlocale, sources = 0;
int rval = -1; int rval = -1;
debug_decl(sudoers_policy_init, SUDOERS_DEBUG_PLUGIN) debug_decl(sudoers_policy_init, SUDOERS_DEBUG_PLUGIN)
@@ -183,7 +183,11 @@ sudoers_policy_init(void *info, char * const envp[])
if (!set_perms(PERM_ROOT)) if (!set_perms(PERM_ROOT))
debug_return_int(-1); debug_return_int(-1);
/* Open and parse sudoers, set global defaults */ /*
* Open and parse sudoers, set global defaults.
* Uses the C locale unless another is specified in sudoers.
*/
sudoers_setlocale(SUDOERS_LOCALE_SUDOERS, &oldlocale);
TAILQ_FOREACH_SAFE(nss, snl, entries, nss_next) { TAILQ_FOREACH_SAFE(nss, snl, entries, nss_next) {
if (nss->open(nss) == 0 && nss->parse(nss) == 0) { if (nss->open(nss) == 0 && nss->parse(nss) == 0) {
sources++; sources++;
@@ -245,6 +249,9 @@ cleanup:
if (!restore_perms()) if (!restore_perms())
rval = -1; rval = -1;
/* Restore user's locale. */
sudoers_setlocale(oldlocale, NULL);
debug_return_int(rval); debug_return_int(rval);
} }