rpms/pam_pkcs11/F-13 pam_pkcs11-0.6.2-login_required.patch, NONE, 1.1 pam_pkcs11.spec, 1.34, 1.35

[Robert Relyea]

Author: rrelyea

Update of /cvs/extras/rpms/pam_pkcs11/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30477

Modified Files:
	pam_pkcs11.spec 
Added Files:
	pam_pkcs11-0.6.2-login_required.patch 
Log Message:
* Fri Mar 19 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-3
> - fix missing function



pam_pkcs11-0.6.2-login_required.patch:
 pkcs11_lib.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

--- NEW FILE pam_pkcs11-0.6.2-login_required.patch ---
diff -up ./src/common/pkcs11_lib.c.login_required ./src/common/pkcs11_lib.c
--- ./src/common/pkcs11_lib.c.login_required	2010-03-18 17:45:38.091458000 -0700
+++ ./src/common/pkcs11_lib.c	2010-03-18 17:48:24.498131000 -0700
@@ -662,6 +662,16 @@ int pkcs11_login(pkcs11_handle_t *h, cha
   return (rv == SECSuccess) ? 0 : -1;
 }
 
+int get_slot_login_required(pkcs11_handle_t *h)
+{
+  if (h->slot == NULL) {
+    DBG("Login failed: No Slot selected");
+    return -1;
+  }
+
+  return PK11_NeedLogin(h->slot);
+}
+
 int close_pkcs11_session(pkcs11_handle_t *h)
 {
   if (h->slot) {


Index: pam_pkcs11.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_pkcs11/F-13/pam_pkcs11.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- pam_pkcs11.spec	13 Jan 2010 23:12:09 -0000	1.34
+++ pam_pkcs11.spec	25 Mar 2010 00:46:11 -0000	1.35
@@ -1,12 +1,12 @@
 %global nss_version 3.10
 %global nspr_version 4.6
-%global with_curl	0
-%global with_ldap	0
+%global with_curl	1
+%global with_ldap	1
 
 
 Name:           pam_pkcs11
 Version:        0.6.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        PKCS #11/NSS PAM login module
 
 Group:          System Environment/Base
@@ -15,6 +15,7 @@ URL:            http://www.opensc-projec
 Source0: 	http://www.opensc-project.org/files/pam_pkcs11/%{name}-%{version}.tar.gz
 Source1:	rh_pam_pkcs11.conf
 Source2:	rh_pkcs11_eventmgr.conf
+patch1:		pam_pkcs11-0.6.2-login_required.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pam-devel
@@ -45,6 +46,7 @@ Additional included pam_pkcs11 related t
 
 %prep
 %setup -q -n pam_pkcs11-%{version}
+%patch1 -p1 -b .login-required
 
 %build
 
@@ -131,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/card_eventmgr.1.gz
 
 %changelog
+* Fri Mar 19 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-3
+- fix missing function
+
 * Wed Jan 5 2010 Bob Relyea <rrelyea at redhat.com> - 0.6.2-2
 - Pick up the latest pam_pkcs11 from upstream