diff options
| author | Richard Guy Briggs <rgb@redhat.com> | 2013-06-27 15:31:16 -0400 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2013-07-01 21:49:14 +0000 |
| commit | 40ff0c583388d1bb1ef1abfd8522d4aa45f6a7ec (patch) | |
| tree | 5736cbd2fbf225e1294da868253c805cdde92c9a | |
| parent | 333686501468f66160c8eb50ae23f1dc08b82e12 (diff) | |
| download | pam-40ff0c583388d1bb1ef1abfd8522d4aa45f6a7ec.tar.gz pam-40ff0c583388d1bb1ef1abfd8522d4aa45f6a7ec.tar.bz2 pam-40ff0c583388d1bb1ef1abfd8522d4aa45f6a7ec.zip | |
pam_tty_audit: fix a typo that crept in during patch review
* modules/pam_tty_audit/pam_tty_audit.c (pam_sm_open_session): Replace
all occurrences of HAVE_AUDIT_TTY_STATUS_LOG_PASSWD with
HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD.
* configure.in (HAVE_AUDIT_TTY_STATUS_LOG_PASSWD): Remove.
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | modules/pam_tty_audit/pam_tty_audit.c | 22 |
2 files changed, 11 insertions, 13 deletions
diff --git a/configure.in b/configure.in index b92d9ac0..1961354a 100644 --- a/configure.in +++ b/configure.in @@ -397,8 +397,6 @@ fi AC_SUBST(LIBAUDIT) AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS], [test "x$HAVE_AUDIT_TTY_STATUS" = xyes]) -AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS_LOG_PASSWD], - [test "x$ac_cv_member_audit_tty_status_log_passwd" = xyes]) AC_CHECK_HEADERS(xcrypt.h crypt.h) AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"], diff --git a/modules/pam_tty_audit/pam_tty_audit.c b/modules/pam_tty_audit/pam_tty_audit.c index a3b590db..7dc37395 100644 --- a/modules/pam_tty_audit/pam_tty_audit.c +++ b/modules/pam_tty_audit/pam_tty_audit.c @@ -201,9 +201,9 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) struct audit_tty_status *old_status, new_status; const char *user; int i, fd, open_only; -#ifdef HAVE_AUDIT_TTY_STATUS_LOG_PASSWD +#ifdef HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD int log_passwd; -#endif /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#endif /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ (void)flags; @@ -215,9 +215,9 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) command = CMD_NONE; open_only = 0; -#ifdef HAVE_AUDIT_TTY_STATUS_LOG_PASSWD +#ifdef HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD log_passwd = 0; -#endif /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#endif /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ for (i = 0; i < argc; i++) { if (strncmp (argv[i], "enable=", 7) == 0 @@ -244,13 +244,13 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) else if (strcmp (argv[i], "open_only") == 0) open_only = 1; else if (strcmp (argv[i], "log_passwd") == 0) -#ifdef HAVE_AUDIT_TTY_STATUS_LOG_PASSWD +#ifdef HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD log_passwd = 1; -#else /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#else /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ pam_syslog (pamh, LOG_WARNING, "The log_passwd option was not available at compile time."); #warning "pam_tty_audit: The log_passwd option is not available. Please upgrade your headers/kernel." -#endif /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#endif /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ else { pam_syslog (pamh, LOG_ERR, "unknown option `%s'", argv[i]); @@ -276,13 +276,13 @@ pam_sm_open_session (pam_handle_t *pamh, int flags, int argc, const char **argv) } new_status.enabled = (command == CMD_ENABLE ? 1 : 0); -#ifdef HAVE_AUDIT_TTY_STATUS_LOG_PASSWD +#ifdef HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD new_status.log_passwd = log_passwd; -#endif /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#endif /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ if (old_status->enabled == new_status.enabled -#ifdef HAVE_AUDIT_TTY_STATUS_LOG_PASSWD +#ifdef HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD && old_status->log_passwd == new_status.log_passwd -#endif /* HAVE_AUDIT_TTY_STATUS_LOG_PASSWD */ +#endif /* HAVE_STRUCT_AUDIT_TTY_STATUS_LOG_PASSWD */ ) { open_only = 1; /* to clean up old_status */ |