From owner-svn-src-all@FreeBSD.ORG Thu Dec 22 19:34:39 2011 Return-Path: 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 946A2106564A; Thu, 22 Dec 2011 19:34:39 +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 1937A8FC12; Thu, 22 Dec 2011 19:34:38 +0000 (UTC) Received: from ds4.des.no (des.no [84.49.246.2]) by smtp.des.no (Postfix) with ESMTP id 85E406E27; Thu, 22 Dec 2011 19:34:32 +0000 (UTC) Received: by ds4.des.no (Postfix, from userid 1001) id 30A2081DE; Thu, 22 Dec 2011 20:34:30 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Gleb Smirnoff References: <201112221810.pBMIAFlo028054@svn.freebsd.org> <20111222182219.GS80057@FreeBSD.org> <86bor0sbra.fsf@ds4.des.no> <867h1osbgl.fsf@ds4.des.no> <20111222184258.GU80057@FreeBSD.org> Date: Thu, 22 Dec 2011 20:34:29 +0100 In-Reply-To: <20111222184258.GU80057@FreeBSD.org> (Gleb Smirnoff's message of "Thu, 22 Dec 2011 22:42:58 +0400") Message-ID: <8639ccs8my.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: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2011 19:34:39 -0000 Gleb Smirnoff writes: > "Dag-Erling Sm=C3=B8rgrav" writes: > > @@ -63,10 +63,15 @@ > > static void * > > try_dlopen(const char *modfn) > > { > > + void *dlh; > >=20=20 > > if (openpam_check_path_owner_perms(modfn) !=3D 0) > > return (NULL); > > - return (dlopen(modfn, RTLD_NOW)); > > + if ((dlh =3D dlopen(modfn, RTLD_NOW)) =3D=3D NULL) { > > + openpam_log(PAM_LOG_DEBUG, "%s: %s", modfn, dlerror()); > > + errno =3D 0; > > + } > > + return (dlh); > > } > > Why not PAM_LOG_ERROR? copy-paste mistake > > /* > > @@ -124,7 +129,8 @@ > > dlclose(dlh); > > FREE(module); > > err: > > - openpam_log(PAM_LOG_ERROR, "%m"); > > + if (errno !=3D 0) > > + openpam_log(PAM_LOG_ERROR, "%s: %m", path); > > return (NULL); > > } > > I think vpath is better choice here, as explained in previous mail At this point, vpath is either NULL or garbage. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no