From bd093f250963e33c98801a1058de337e38ca1ef0 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Fri, 8 Oct 2010 11:53:38 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- 2010-10-07 Dmitry V. Levin * modules/pam_selinux/pam_selinux.c (verbose_message): Fix format string. --- modules/pam_selinux/pam_selinux.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/pam_selinux') diff --git a/modules/pam_selinux/pam_selinux.c b/modules/pam_selinux/pam_selinux.c index c6f887a6..1f412d17 100644 --- a/modules/pam_selinux/pam_selinux.c +++ b/modules/pam_selinux/pam_selinux.c @@ -545,9 +545,9 @@ static void verbose_message(pam_handle_t *pamh, char *msg, int debug) { if (debug) - pam_syslog(pamh, LOG_NOTICE, msg); + pam_syslog(pamh, LOG_NOTICE, "%s", msg); - pam_info (pamh, "%s", msg); + pam_info(pamh, "%s", msg); } PAM_EXTERN int -- cgit v1.2.3 From 8bae86d2b21b9d388c5e0834dba70a0d2585f894 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 19 Oct 2010 16:36:35 +0000 Subject: Relevant BUGIDs: Purpose of commit: bugfix Commit summary: --------------- 2010-10-19 Dmitry V. Levin * modules/pam_selinux/Makefile.am (pam_selinux_la_LIBADD): Add @LIBAUDIT@. --- modules/pam_selinux/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/pam_selinux') diff --git a/modules/pam_selinux/Makefile.am b/modules/pam_selinux/Makefile.am index baf782a8..5c83acb4 100644 --- a/modules/pam_selinux/Makefile.am +++ b/modules/pam_selinux/Makefile.am @@ -25,7 +25,7 @@ pam_selinux_check_LDFLAGS = $(AM_LDFLAGS) \ -L$(top_builddir)/libpam -lpam \ -L$(top_builddir)/libpam_misc -lpam_misc -pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ +pam_selinux_la_LIBADD = -L$(top_builddir)/libpam -lpam @LIBSELINUX@ @LIBAUDIT@ pam_selinux_la_LDFLAGS = -no-undefined -avoid-version -module if HAVE_VERSIONING pam_selinux_la_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map -- cgit v1.2.3 From fb1f2d3b6a1594180190413e15b589b117acb5a1 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 19 Oct 2010 23:33:02 +0000 Subject: Relevant BUGIDs: Purpose of commit: cleanup Commit summary: --------------- 2010-10-19 Dmitry V. Levin * modules/pam_selinux/pam_selinux.c (verbose_message): Remove. (pam_sm_open_session): Call send_text() instead of verbose_message(). --- modules/pam_selinux/pam_selinux.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'modules/pam_selinux') diff --git a/modules/pam_selinux/pam_selinux.c b/modules/pam_selinux/pam_selinux.c index 1f412d17..64fabafd 100644 --- a/modules/pam_selinux/pam_selinux.c +++ b/modules/pam_selinux/pam_selinux.c @@ -540,16 +540,6 @@ static security_context_t ttyn_context=NULL; /* The current context of ttyn dev static int selinux_enabled=0; static char *ttyn=NULL; -/* Tell the user that access has been granted. */ -static void -verbose_message(pam_handle_t *pamh, char *msg, int debug) -{ - if (debug) - pam_syslog(pamh, LOG_NOTICE, "%s", msg); - - pam_info(pamh, "%s", msg); -} - PAM_EXTERN int pam_sm_authenticate(pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) @@ -726,7 +716,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, char msg[PATH_MAX]; snprintf(msg, sizeof(msg), _("Security Context %s Assigned"), user_context); - verbose_message(pamh, msg, debug); + send_text(pamh, msg, debug); } if (ret) { pam_syslog(pamh, LOG_ERR, @@ -747,7 +737,7 @@ pam_sm_open_session(pam_handle_t *pamh, int flags UNUSED, char msg[PATH_MAX]; snprintf(msg, sizeof(msg), _("Key Creation Context %s Assigned"), user_context); - verbose_message(pamh, msg, debug); + send_text(pamh, msg, debug); } if (ret) { pam_syslog(pamh, LOG_ERR, -- cgit v1.2.3