Relevant BUGIDs: 129027, 128576

Purpose of commit: new feature + documentation

Commit summary:
---------------
Cleaned up the handling of AUTHTOK items and pam_[gs]et_data() functions.
Added more clear documentation about the pam_[gs]et_item() functions to
the pam_appl and pam_modules programmer guides.

1 files changed, 14 insertions, 2 deletions

diff --git a/libpam/pam_session.c b/libpam/pam_session.c
index de2538d0..16b021df 100644
--- a/libpam/pam_session.c
+++ b/libpam/pam_session.c
@@ -12,7 +12,13 @@ int pam_open_session(pam_handle_t *pamh, int flags)
 {
     D(("called"));
 
-    IF_NO_PAMH("pam_open_session",pamh,PAM_SYSTEM_ERR);
+    IF_NO_PAMH("pam_open_session", pamh, PAM_SYSTEM_ERR);
+
+    if (__PAM_FROM_MODULE(pamh)) {
+	D(("called from module!?"));
+	return PAM_SYSTEM_ERR;
+    }
+
     return _pam_dispatch(pamh, flags, PAM_OPEN_SESSION);
 }
 
@@ -20,6 +26,12 @@ int pam_close_session(pam_handle_t *pamh, int flags)
 {
     D(("called"));
 
-    IF_NO_PAMH("pam_close_session",pamh,PAM_SYSTEM_ERR);
+    IF_NO_PAMH("pam_close_session", pamh, PAM_SYSTEM_ERR);
+
+    if (__PAM_FROM_MODULE(pamh)) {
+	D(("called from module!?"));
+	return PAM_SYSTEM_ERR;
+    }
+
     return _pam_dispatch(pamh, flags, PAM_CLOSE_SESSION);
 }