From owner-svn-src-all@FreeBSD.ORG  Thu Dec 22 18:44:16 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2E7DB106564A;
	Thu, 22 Dec 2011 18:44:16 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.64.117])
	by mx1.freebsd.org (Postfix) with ESMTP id A488A8FC16;
	Thu, 22 Dec 2011 18:44:15 +0000 (UTC)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
	by cell.glebius.int.ru (8.14.5/8.14.5) with ESMTP id pBMIgwMI092987;
	Thu, 22 Dec 2011 22:42:58 +0400 (MSK)
	(envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
	by cell.glebius.int.ru (8.14.5/8.14.5/Submit) id pBMIgwQG092986;
	Thu, 22 Dec 2011 22:42:58 +0400 (MSK)
	(envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
	glebius@FreeBSD.org using -f
Date: Thu, 22 Dec 2011 22:42:58 +0400
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Dag-Erling Sm??rgrav <des@des.no>
Message-ID: <20111222184258.GU80057@FreeBSD.org>
References: <201112221810.pBMIAFlo028054@svn.freebsd.org>
	<20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no>
	<867h1osbgl.fsf@ds4.des.no>
MIME-Version: 1.0
Content-Type: text/plain; charset=koi8-r
Content-Disposition: inline
In-Reply-To: <867h1osbgl.fsf@ds4.des.no>
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-all@FreeBSD.org, src-committers@FreeBSD.org,
	svn-src-vendor@FreeBSD.org
Subject: Re: svn commit: r228809 - vendor/openpam/dist/lib
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 22 Dec 2011 18:44:16 -0000

On Thu, Dec 22, 2011 at 07:33:30PM +0100, Dag-Erling Sm??rgrav wrote:
D> Actually, there is no good general solution, because the rtld does not
D> set errno.  Here's what I came up with:
D> 
D> Index: openpam_dynamic.c
D> ===================================================================
D> --- openpam_dynamic.c	(revision 509)
D> +++ openpam_dynamic.c	(working copy)
D> @@ -63,10 +63,15 @@
D>  static void *
D>  try_dlopen(const char *modfn)
D>  {
D> +	void *dlh;
D>  
D>  	if (openpam_check_path_owner_perms(modfn) != 0)
D>  		return (NULL);
D> -	return (dlopen(modfn, RTLD_NOW));
D> +	if ((dlh = dlopen(modfn, RTLD_NOW)) == NULL) {
D> +		openpam_log(PAM_LOG_DEBUG, "%s: %s", modfn, dlerror());
D> +		errno = 0;
D> +	}
D> +	return (dlh);
D>  }

Why not PAM_LOG_ERROR?

D>  /*
D> @@ -124,7 +129,8 @@
D>  		dlclose(dlh);
D>  	FREE(module);
D>  err:
D> -	openpam_log(PAM_LOG_ERROR, "%m");
D> +	if (errno != 0)
D> +		openpam_log(PAM_LOG_ERROR, "%s: %m", path);
D>  	return (NULL);
D>  }

I think vpath is better choice here, as explained in previous mail

D> I'll wait for your feedback before I commit it.

Thanks!

-- 
Totus tuus, Glebius.