1 files changed, 12 insertions, 2 deletions
diff --git a/libpam/pam_account.c b/libpam/pam_account.c
index ffc01acd..71e04f15 100644
--- a/libpam/pam_account.c
+++ b/libpam/pam_account.c
@@ -6,8 +6,18 @@
 
 int pam_acct_mgmt(pam_handle_t *pamh, int flags)
 {
+    int retval;
+
     D(("called"));
 
-    IF_NO_PAMH("pam_acct_mgmt",pamh,PAM_SYSTEM_ERR);
-    return _pam_dispatch(pamh, flags, PAM_ACCOUNT);
+    IF_NO_PAMH("pam_acct_mgmt", pamh, PAM_SYSTEM_ERR);
+
+    if (__PAM_FROM_MODULE(pamh)) {
+	D(("called from module!?"));
+	return PAM_SYSTEM_ERR;
+    }
+
+    retval = _pam_dispatch(pamh, flags, PAM_ACCOUNT);
+
+    return retval;
 }