Date: Thu, 12 Dec 2002 08:04:17 -0800 (PST) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 22202 for review Message-ID: <200212121604.gBCG4HmU099955@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=22202 Change 22202 by des@des.at.des.thinksec.com on 2002/12/12 08:04:04 Record which primitive is currently executing before calling the service module. Use that information to generate a much better error message when indirect recursion is detected. Instrument openpam_dispatch()'s entry and exit points. Affected files ... .. //depot/projects/openpam/lib/openpam_dispatch.c#18 edit Differences ... ==== //depot/projects/openpam/lib/openpam_dispatch.c#18 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#17 $ + * $P4: //depot/projects/openpam/lib/openpam_dispatch.c#18 $ */ #include <sys/param.h> @@ -60,13 +60,18 @@ pam_chain_t *chain; int err, fail, r; + ENTER(); if (pamh == NULL) - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); /* prevent recursion */ if (pamh->current != NULL) { - openpam_log(PAM_LOG_ERROR, "indirect recursion"); - return (PAM_ABORT); + openpam_log(PAM_LOG_ERROR, + "%s() called while %s::%s() is in progress", + _pam_func_name[primitive], + pamh->current->module->path, + _pam_sm_func_name[pamh->primitive]); + RETURNC(PAM_ABORT); } /* pick a chain */ @@ -86,7 +91,7 @@ chain = pamh->chains[PAM_PASSWORD]; break; default: - return (PAM_SYSTEM_ERR); + RETURNC(PAM_SYSTEM_ERR); } /* execute */ @@ -98,6 +103,7 @@ chain->module->path, _pam_sm_func_name[primitive]); continue; } else { + pamh->primitive = primitive; pamh->current = chain; r = (chain->module->func[primitive])(pamh, flags, chain->optc, (const char **)chain->optv); @@ -153,8 +159,7 @@ if (!fail && err != PAM_NEW_AUTHTOK_REQD) err = PAM_SUCCESS; - openpam_log(PAM_LOG_DEBUG, "returning: %s", pam_strerror(pamh, err)); - return (err); + RETURNC(err); } #if !defined(OPENPAM_RELAX_CHECKS) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200212121604.gBCG4HmU099955>