diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2007-07-12 19:37:48 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2007-07-12 19:37:48 +0000 |
| commit | 483a708fafaf49ba41eb0214eed2b79fe7e1f8c3 (patch) | |
| tree | c05196455527fae45f8a2fb4d967e0dc17f85e5e /libpam | |
| parent | 19474e60f32b365c8e8835fb4fe9859d6837bf99 (diff) | |
| download | pam-483a708fafaf49ba41eb0214eed2b79fe7e1f8c3.tar.gz pam-483a708fafaf49ba41eb0214eed2b79fe7e1f8c3.tar.bz2 pam-483a708fafaf49ba41eb0214eed2b79fe7e1f8c3.zip | |
Relevant BUGIDs:
Purpose of commit: bugfix
Commit summary:
---------------
2007-07-12 Thorsten Kukuk <kukuk@thkukuk.de>
* libpam/pam_audit.c (_pam_audit_writelog): Don't return
error if application runs as normal user. Fixes regression
introduced with last change.
Diffstat (limited to 'libpam')
| -rw-r--r-- | libpam/pam_audit.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/libpam/pam_audit.c b/libpam/pam_audit.c index 18a98f1f..3233fc44 100644 --- a/libpam/pam_audit.c +++ b/libpam/pam_audit.c @@ -35,14 +35,24 @@ _pam_audit_writelog(pam_handle_t *pamh, int audit_fd, int type, (retval != PAM_USER_UNKNOWN && pamh->user) ? pamh->user : "?", -1, pamh->rhost, NULL, pamh->tty, retval == PAM_SUCCESS ); - if (rc == -1 && errno != old_errno) + /* libaudit sets errno to his own negative error code. This can be + an official errno number, but must not. It can also be a audit + internal error code. Which makes errno useless :-((. Try the + best to fix it. */ + errno = -rc; + + if (rc < 0 && errno != old_errno) { old_errno = errno; pam_syslog (pamh, LOG_CRIT, "audit_log_acct_message() failed: %m"); } pamh->audit_state |= PAMAUDIT_LOGGED; - return rc; + + if (rc == -EPERM && getuid () != 0) + return 0; + else + return rc; } int |