rpms/pam_pkcs11/devel pam_pkcs11-0.5.3-setup-tool.patch, 1.1, 1.2 pam_pkcs11.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: tmraz

Update of /cvs/dist/rpms/pam_pkcs11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27639

Modified Files:
	pam_pkcs11-0.5.3-setup-tool.patch pam_pkcs11.spec 
Log Message:
* Mon Aug 28 2006 Tomas Mraz <tmraz at redhat.com>
- pkcs11_setup should respect $LIB in module paths (#204252)


pam_pkcs11-0.5.3-setup-tool.patch:
 Makefile.am    |    7 
 Makefile.in    |   21 +-
 pkcs11_setup.c |  519 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 540 insertions(+), 7 deletions(-)

Index: pam_pkcs11-0.5.3-setup-tool.patch
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11-0.5.3-setup-tool.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pam_pkcs11-0.5.3-setup-tool.patch	18 Jul 2006 20:45:28 -0000	1.1
+++ pam_pkcs11-0.5.3-setup-tool.patch	28 Aug 2006 21:03:47 -0000	1.2
@@ -107,7 +107,7 @@
  .c.o:
 --- /dev/null	2006-07-07 08:05:54.592713000 +0200
 +++ pam_pkcs11-0.5.3/src/tools/pkcs11_setup.c	2006-07-07 13:54:45.000000000 +0200
-@@ -0,0 +1,516 @@
+@@ -0,0 +1,519 @@
 +/*
 + * PKCS#11 Card viewer tool
 + * Copyright (C) 2006 Red Hat, Inc.
@@ -136,6 +136,7 @@
 +#include <unistd.h>
 +#include <stdio.h>
 +#include <stdlib.h>
++#include <dlfcn.h>
 +#include "../scconf/scconf.h"
 +#include "../common/debug.h"
 +#include "../common/error.h"
@@ -228,6 +229,7 @@
 +
 +    /* list only those smart cards which are actually installed */
 +    for (i=0; pkcs11_blocks[i]; i++) {
++    	void *libhandle;
 +    	const char *path = 
 +    		scconf_get_str(pkcs11_blocks[i], "module", NULL);
 +    	/* check to see if the module exists on the system */
@@ -235,7 +237,8 @@
 +    		continue;
 +    	}
 +    	/* verify the module exists */
-+        if (access(path, X_OK) == 0) {
++        if ((libhandle=dlopen(path, 0)) != NULL) {
++    	    dlclose(libhandle);
 +    	    if (pkcs11_blocks[i] && pkcs11_blocks[i]->name
 +    	        && pkcs11_blocks[i]->name->data) {
 +    		    printf("%s\n", pkcs11_blocks[i]->name->data);


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/dist/rpms/pam_pkcs11/devel/pam_pkcs11.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pam_pkcs11.spec	26 Aug 2006 00:19:06 -0000	1.13
+++ pam_pkcs11.spec	28 Aug 2006 21:03:47 -0000	1.14
@@ -151,6 +151,9 @@
 %doc %{_datadir}/%{name}/pkcs11_eventmgr.conf.example
 
 %changelog
+* Mon Aug 28 2006 Tomas Mraz <tmraz at redhat.com>
+- pkcs11_setup should respect $LIB in module paths (#204252)
+
 * Mon Aug 28 2006 Robert Relyea <rrelyea at redhat.com> 0.5.3-13
 - Fix the default mapping order.
 - Make ocsp support controlled by a config entry.