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

Don't kill the user's tickets until after sudoers has been parsed

Browse Source 
since tty_tickets and ticket_dir could be set in sudoers.
This commit is contained in:
Todd C. Miller
1999-12-05 02:54:20 +00:00
parent c6136f9764
commit 12f5216097
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
check.c
View File

@@ -457,9 +457,9 @@ remove_timestamp(remove)
status = unlink(timestampfile);
else
status = rmdir(timestampdir);
if (status == -1) {
if (status == -1 && errno != ENOENT) {
log_error(NO_EXIT, "can't remove %s (%s), will reset to epoch",
strerror(errno), ts);
ts, strerror(errno));
remove = FALSE;
}
}

17
sudo.c
View File

@@ -163,6 +163,7 @@ main(argc, argv)
int fd;
int cmnd_status;
int sudo_mode;
int check_cmnd;
#ifdef POSIX_SIGNALS
sigset_t set, oset;
#else
@@ -217,6 +218,7 @@ main(argc, argv)
/* Setup defaults data structures. */
init_defaults();
check_cmnd = 1;
if (sudo_mode & MODE_SHELL)
user_cmnd = "shell";
else
@@ -235,10 +237,12 @@ main(argc, argv)
break;
case MODE_VALIDATE:
user_cmnd = "validate";
check_cmnd = 0;
break;
case MODE_KILL:
case MODE_INVALIDATE:
user_cmnd = "kill";
check_cmnd = 0;
break;
case MODE_LISTDEFS:
list_options();
@@ -247,6 +251,7 @@ main(argc, argv)
case MODE_LIST:
user_cmnd = "list";
printmatches = 1;
check_cmnd = 0;
break;
}
@@ -262,17 +267,17 @@ main(argc, argv)
check_sudoers(); /* check mode/owner on _PATH_SUDOERS */
add_env(!(sudo_mode & MODE_SHELL)); /* add in SUDO_* envariables */
/* Validate the user but don't search for pseudo-commands. */
validated = sudoers_lookup(check_cmnd);
/* This goes after the sudoers parse since we honor sudoers options. */
if (sudo_mode == MODE_KILL || sudo_mode == MODE_INVALIDATE) {
remove_timestamp((sudo_mode == MODE_KILL));
exit(0);
}
add_env(!(sudo_mode & MODE_SHELL)); /* add in SUDO_* envariables */
/* Validate the user but don't search for pseudo-commands. */
validated =
sudoers_lookup((sudo_mode != MODE_VALIDATE && sudo_mode != MODE_LIST));
if (validated & VALIDATE_ERROR)
log_error(0, "parse error in %s near line %d", _PATH_SUDOERS,
errorlineno);