svn commit: r228809 - vendor/openpam/dist/lib

Gleb Smirnoff glebius at FreeBSD.org
Thu Dec 22 18:44:16 UTC 2011


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.


More information about the svn-src-vendor mailing list