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

Solaris BSM audit return EINVAL when auditing is not enabled, whereas

Browse Source 
OpenBSM returns ENOSYS.
This commit is contained in:
Todd C. Miller
2010-09-08 09:47:00 -04:00
parent e74b6e6b1e
commit d9a3526320
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/sudoers/bsm_audit.c
View File

@@ -32,6 +32,16 @@
#include "bsm_audit.h" #include "bsm_audit.h"
/*
* Solaris auditon() returns EINVAL if BSM audit not configured.
* OpenBSM returns ENOSYS for unimplemented options.
*/
#ifdef __sun__
# define AUDIT_NOT_CONFIGURED EINVAL
#else
# define AUDIT_NOT_CONFIGURED ENOSYS
#endif
void log_error(int flags, const char *fmt, ...) __attribute__((__noreturn__)); void log_error(int flags, const char *fmt, ...) __attribute__((__noreturn__));
static int static int
@@ -72,7 +82,7 @@ bsm_audit_success(char **exec_args)
* If we are not auditing, don't cut an audit record; just return. * If we are not auditing, don't cut an audit record; just return.
*/ */
if (auditon(A_GETCOND, (caddr_t)&au_cond, sizeof(long)) < 0) { if (auditon(A_GETCOND, (caddr_t)&au_cond, sizeof(long)) < 0) {
if (errno == ENOSYS) if (errno == AUDIT_NOT_CONFIGURED)
return; return;
log_error(0, "Could not determine audit condition"); log_error(0, "Could not determine audit condition");
} }
@@ -133,7 +143,7 @@ bsm_audit_failure(char **exec_args, char const *const fmt, va_list ap)
* If we are not auditing, don't cut an audit record; just return. * If we are not auditing, don't cut an audit record; just return.
*/ */
if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) { if (auditon(A_GETCOND, &au_cond, sizeof(long)) < 0) {
if (errno == ENOSYS) if (errno == AUDIT_NOT_CONFIGURED)
return; return;
log_error(0, "Could not determine audit condition"); log_error(0, "Could not determine audit condition");
} }