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, 10 insertions, 1 deletions

diff --git a/libpam/pam_dispatch.c b/libpam/pam_dispatch.c
index 285f3316..02325665 100644
--- a/libpam/pam_dispatch.c
+++ b/libpam/pam_dispatch.c
@@ -195,7 +195,12 @@ int _pam_dispatch(pam_handle_t *pamh, int flags, int choice)
     int retval;
     _pam_boolean resumed;
 
-    IF_NO_PAMH("_pam_dispatch",pamh,PAM_SYSTEM_ERR);
+    IF_NO_PAMH("_pam_dispatch", pamh, PAM_SYSTEM_ERR);
+
+    if (__PAM_FROM_MODULE(pamh)) {
+	D(("called from a module!?"));
+	return PAM_SYSTEM_ERR;
+    }
 
     /* Load all modules, resolve all symbols */
 
@@ -265,10 +270,14 @@ int _pam_dispatch(pam_handle_t *pamh, int flags, int choice)
 	resumed = PAM_FALSE;
     }
 
+    __PAM_TO_MODULE(pamh);
+
     /* call the list of module functions */
     retval = _pam_dispatch_aux(pamh, flags, h, resumed);
     resumed = PAM_FALSE;
 
+    __PAM_TO_APP(pamh);
+
     /* Should we recall where to resume next time? */
     if (retval == PAM_INCOMPLETE) {
 	D(("module [%d] returned PAM_INCOMPLETE"));