diff options
| author | Dmitry V. Levin <ldv@altlinux.org> | 2010-10-19 23:33:02 +0000 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2010-10-19 23:33:02 +0000 |
| commit | fb1f2d3b6a1594180190413e15b589b117acb5a1 (patch) | |
| tree | f270db202353b43857c6bf2b93c16eb4cf81e55d | |
| parent | 64d2ded89df33d22d604ae0672156c47963689c0 (diff) | |
Relevant BUGIDs:
Purpose of commit: cleanup
Commit summary:
---------------
2010-10-19 Dmitry V. Levin <ldv@altlinux.org>
* modules/pam_selinux/pam_selinux.c (verbose_message): Remove.
(pam_sm_open_session): Call send_text() instead of verbose_message().
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | modules/pam_selinux/pam_selinux.c | 14 |
2 files changed, 5 insertions, 12 deletions
@@ -9,6 +9,9 @@ * configure.in: Use PAM_LD_NO_UNDEFINED. * Makefile.am (M4_FILES): Add m4/ld-no-undefined.m4. + * modules/pam_selinux/pam_selinux.c (verbose_message): Remove. + (pam_sm_open_session): Call send_text() instead of verbose_message(). + 2010-10-19 Thorsten Kukuk <kukuk@thkukuk.de> * modules/pam_env/pam_env.8.xml: Document side effects of 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, |