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

Bring back VALIDATE_ERROR which will be used in the case of memory

Browse Source 
allocation errors.
This commit is contained in:
Todd C. Miller
2015-06-04 20:42:42 -06:00
parent 9884df8c9e
commit 8eff57f070
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/sudoers/logging.c
View File

@@ -770,7 +770,7 @@ should_mail(int status)
{ {
debug_decl(should_mail, SUDOERS_DEBUG_LOGGING) debug_decl(should_mail, SUDOERS_DEBUG_LOGGING)
debug_return_bool(def_mail_always || debug_return_bool(def_mail_always || ISSET(status, VALIDATE_ERROR) ||
(def_mail_all_cmnds && ISSET(sudo_mode, (MODE_RUN|MODE_EDIT))) || (def_mail_all_cmnds && ISSET(sudo_mode, (MODE_RUN|MODE_EDIT))) ||
(def_mail_no_user && ISSET(status, FLAG_NO_USER)) || (def_mail_no_user && ISSET(status, FLAG_NO_USER)) ||
(def_mail_no_host && ISSET(status, FLAG_NO_HOST)) || (def_mail_no_host && ISSET(status, FLAG_NO_HOST)) ||

6
plugins/sudoers/sudoers.c
View File

@@ -294,7 +294,11 @@ sudoers_policy_main(int argc, char * const argv[], int pwflag, char *env_add[],
TAILQ_FOREACH(nss, snl, entries) { TAILQ_FOREACH(nss, snl, entries) {
validated = nss->lookup(nss, validated, pwflag); validated = nss->lookup(nss, validated, pwflag);
if (ISSET(validated, VALIDATE_SUCCESS)) { if (ISSET(validated, VALIDATE_ERROR)) {
/* The lookup function should have printed an error. */
rval = -1;
goto done;
} else if (ISSET(validated, VALIDATE_SUCCESS)) {
/* Handle [SUCCESS=return] */ /* Handle [SUCCESS=return] */
if (nss->ret_if_found) if (nss->ret_if_found)
break; break;

5
plugins/sudoers/sudoers.h
View File

@@ -113,8 +113,9 @@ struct sudo_user {
* Return values for sudoers_lookup(), also used as arguments for log_auth() * Return values for sudoers_lookup(), also used as arguments for log_auth()
* Note: cannot use '0' as a value here. * Note: cannot use '0' as a value here.
*/ */
#define VALIDATE_SUCCESS 0x001 #define VALIDATE_ERROR 0x001
#define VALIDATE_FAILURE 0x002 #define VALIDATE_SUCCESS 0x002
#define VALIDATE_FAILURE 0x004
#define FLAG_CHECK_USER 0x010 #define FLAG_CHECK_USER 0x010
#define FLAG_NO_USER 0x020 #define FLAG_NO_USER 0x020
#define FLAG_NO_HOST 0x040 #define FLAG_NO_HOST 0x040