[linux-pam] pam_rootok: fix linking in --enable-audit mode
by Dmitry V. Levin
commit 7561a59dcfa7a334055244a43195148c4bb0aad1
Author: Dmitry V. Levin <ldv(a)altlinux.org>
Date: Mon Jul 1 22:18:02 2013 +0000
pam_rootok: fix linking in --enable-audit mode
pam_rootok.c explicitly uses functions from libaudit, so the module has
to be linked with the library.
* modules/pam_rootok/Makefile.am (pam_rootok_la_LIBADD): Add @LIBAUDIT@.
modules/pam_rootok/Makefile.am | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/modules/pam_rootok/Makefile.am b/modules/pam_rootok/Makefile.am
index d132367..f8f292e 100644
--- a/modules/pam_rootok/Makefile.am
+++ b/modules/pam_rootok/Makefile.am
@@ -25,7 +25,7 @@ if HAVE_VERSIONING
endif
securelib_LTLIBRARIES = pam_rootok.la
-pam_rootok_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@
+pam_rootok_la_LIBADD = $(top_builddir)/libpam/libpam.la @LIBSELINUX@ @LIBAUDIT@
if ENABLE_REGENERATE_MAN
noinst_DATA = README
10 years, 9 months
- 1
- 0
[linux-pam] pam_tty_audit: fix a typo that crept in during patch review
by Dmitry V. Levin
commit 40ff0c583388d1bb1ef1abfd8522d4aa45f6a7ec
Author: Richard Guy Briggs <rgb(a)redhat.com>
Date: Thu Jun 27 15:31:16 2013 -0400
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(a)redhat.com>
Signed-off-by: Dmitry V. Levin <ldv(a)altlinux.org>
configure.in | 2 --
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 b92d9ac..1961354 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 a3b590d..7dc3739 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 */
10 years, 9 months
- 1
- 0
- ← Newer
- 1
- Older →