From owner-freebsd-current@FreeBSD.ORG Mon Jan 9 20:25:13 2012 Return-Path: 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 6BF65106566C; Mon, 9 Jan 2012 20:25:13 +0000 (UTC) (envelope-from des@des.no) Received: from smtp.des.no (smtp.des.no [194.63.250.102]) by mx1.freebsd.org (Postfix) with ESMTP id 300308FC0A; Mon, 9 Jan 2012 20:25:12 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 2C5BF60FD; Mon, 9 Jan 2012 20:25:12 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id D19DB8157; Mon, 9 Jan 2012 21:25:11 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Don Lewis References: <201201091958.q09JwKZK029815@gw.catspoiler.org> Date: Mon, 09 Jan 2012 21:25:11 +0100 In-Reply-To: <201201091958.q09JwKZK029815@gw.catspoiler.org> (Don Lewis's message of "Mon, 9 Jan 2012 11:58:20 -0800 (PST)") Message-ID: <86pqesy66w.fsf@ds4.des.no> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Jan 2012 20:25:13 -0000 Don Lewis writes: > After staring at the code a lot more, I see your point about the loss of > information. The problem is that openpam_parse_chain() returns > PAM_SUCCESS whether or not if found anything, but we want the loop to > terminate when either an error is detected or if openpam_parse_chain() > actually found something. Maybe changing the loop exit to something > like this would work: > > if (ret !=3D PAM_SUCCESS || pamh->chains[facility] !=3D NULL) > return (ret); The simplest fix for now is probably to revert r487; it applies cleanly except for the first hunk, which is easy to apply manually. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no