aboutsummaryrefslogtreecommitdiff
path: root/modules/pam_unix/pam_unix_sess.c
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2019-01-22 15:01:39 -0800
committerSteve Langasek <vorlon@debian.org>2019-01-22 15:02:03 -0800
commit5cd7bb4511a7c2b355a615f19a9eca193320aa3e (patch)
treeceb3e40947d1f0f4712f473e410494177d5763e0 /modules/pam_unix/pam_unix_sess.c
parentcfa575497a113d8da1a2c79ef028b5c9648dc136 (diff)
parentf00afb1ef201b2eef7f9ddbe5a0c6ca802cf49bb (diff)
downloadpam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.gz
pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.bz2
pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.zip
Merge upstream version 1.3.0
Diffstat (limited to 'modules/pam_unix/pam_unix_sess.c')
-rw-r--r--modules/pam_unix/pam_unix_sess.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/modules/pam_unix/pam_unix_sess.c b/modules/pam_unix/pam_unix_sess.c
index d1376732..dbc62983 100644
--- a/modules/pam_unix/pam_unix_sess.c
+++ b/modules/pam_unix/pam_unix_sess.c
@@ -49,11 +49,7 @@
/* indicate the following groups are defined */
-#ifdef PAM_STATIC
-# include "pam_unix_static.h"
-#else
-# define PAM_SM_SESSION
-#endif
+#define PAM_SM_SESSION
#include <security/_pam_macros.h>
#include <security/pam_modules.h>
@@ -96,8 +92,9 @@ pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
if (login_name == NULL) {
login_name = "";
}
- pam_syslog(pamh, LOG_INFO, "session opened for user %s by %s(uid=%lu)",
- user_name, login_name, (unsigned long)getuid());
+ if (off (UNIX_QUIET, ctrl))
+ pam_syslog(pamh, LOG_INFO, "session opened for user %s by %s(uid=%lu)",
+ user_name, login_name, (unsigned long)getuid());
return PAM_SUCCESS;
}
@@ -126,8 +123,9 @@ pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
"close_session - error recovering service");
return PAM_SESSION_ERR;
}
- pam_syslog(pamh, LOG_INFO, "session closed for user %s",
- user_name);
+ if (off (UNIX_QUIET, ctrl))
+ pam_syslog(pamh, LOG_INFO, "session closed for user %s",
+ user_name);
return PAM_SUCCESS;
}