From owner-freebsd-current@FreeBSD.ORG  Mon Jan  9 14:27:13 2012
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: current@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E53CB106566B
	for <current@FreeBSD.org>; Mon,  9 Jan 2012 14:27:12 +0000 (UTC)
	(envelope-from truckman@FreeBSD.org)
Received: from gw.catspoiler.org (gw.catspoiler.org [75.1.14.242])
	by mx1.freebsd.org (Postfix) with ESMTP id CA4BF8FC08
	for <current@FreeBSD.org>; Mon,  9 Jan 2012 14:27:12 +0000 (UTC)
Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2])
	by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id q09EPmA0026105;
	Mon, 9 Jan 2012 06:25:52 -0800 (PST)
	(envelope-from truckman@FreeBSD.org)
Message-Id: <201201091425.q09EPmA0026105@gw.catspoiler.org>
Date: Mon, 9 Jan 2012 06:25:48 -0800 (PST)
From: Don Lewis <truckman@FreeBSD.org>
To: des@des.no
In-Reply-To: <86y5thx97g.fsf@ds4.des.no>
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8BIT
Cc: current@FreeBSD.org
Subject: Re: couldn't log on to my -CURRENT machine after upgrade to latest
	PAM
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Jan 2012 14:27:13 -0000

On  9 Jan, Dag-Erling Smørgrav wrote:
> Don Lewis <truckman@FreeBSD.org> writes:
>> The documentation says that /etc/pam.conf is only used if
>> /etc/pam.d/service-name isn't found, and the code appears to agree
>> with that, however this doesn't seem to be working as expected after
>> the latest import of PAM.
> 
> The culprit was this commit:
> 
> http://trac.des.no/openpam/changeset/487/trunk/lib/openpam_configure.c
> 
> However, I'm not confident that simply reverting this commit is the
> right way to go.

Thanks for the detective work.  It looks to me like the bug is caused by
the change in the openpam_parse_chain() return value.  In the previous
code it returned the value of count, which I would guess was greater
than zero if it found something.  In that case, the for loop in
openpam_load_chain() would be terminated because r != 0.  In the new
code, openpam_parse_chain() will return PAM_SUCCESS if it found
something, and the loop in openpam_load_chain() will go through another
iteration because ret == PAM_SUCCESS.  I think the code around the end
of the loop should look more like:
		if (ret == PAM_SUCCESS)
			break;
	}
	return (ret);
}