From: Todd C. Miller Date: Wed, 21 Jan 2015 17:36:55 +0000 (-0700) Subject: Remove now-unused VALIDATE_ERROR define. X-Git-Tag: SUDO_1_8_12^2~45 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=399d364a904323017d26609197fced12e6adbfa8;p=sudo Remove now-unused VALIDATE_ERROR define. --- diff --git a/plugins/sudoers/logging.c b/plugins/sudoers/logging.c index 56f642fcc..f7d486ed5 100644 --- a/plugins/sudoers/logging.c +++ b/plugins/sudoers/logging.c @@ -756,7 +756,7 @@ should_mail(int status) { debug_decl(should_mail, SUDOERS_DEBUG_LOGGING, sudoers_debug_instance) - debug_return_bool(def_mail_always || ISSET(status, VALIDATE_ERROR) || + debug_return_bool(def_mail_always || (def_mail_no_user && ISSET(status, FLAG_NO_USER)) || (def_mail_no_host && ISSET(status, FLAG_NO_HOST)) || (def_mail_no_perms && !ISSET(status, VALIDATE_OK))); diff --git a/plugins/sudoers/sudoers.h b/plugins/sudoers/sudoers.h index a957c90ff..c1c66e800 100644 --- a/plugins/sudoers/sudoers.h +++ b/plugins/sudoers/sudoers.h @@ -114,9 +114,8 @@ struct sudo_user { * Note: cannot use '0' as a value here. */ /* XXX - VALIDATE_SUCCESS and VALIDATE_FAILURE instead? */ -#define VALIDATE_ERROR 0x001 -#define VALIDATE_OK 0x002 -#define VALIDATE_NOT_OK 0x004 +#define VALIDATE_OK 0x001 +#define VALIDATE_NOT_OK 0x002 #define FLAG_CHECK_USER 0x010 #define FLAG_NO_USER 0x020 #define FLAG_NO_HOST 0x040