[SCM] GNU gnutls branch, gnutls_2_12_x, updated. gnutls_2_12_6_1-4-gb33a023

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=b33a02336e30ecb7cc9a6e866ca70ffc8c799207

The branch, gnutls_2_12_x has been updated
       via  b33a02336e30ecb7cc9a6e866ca70ffc8c799207 (commit)
       via  4670344db4dd5ffd0fb54be922083a81cf5f8c4b (commit)
      from  683cda5b17f1c9db9d813af937ae7c560f140fee (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b33a02336e30ecb7cc9a6e866ca70ffc8c799207
Author: Stef Walter <address@hidden>
Date:   Mon Jun 6 16:48:54 2011 +0000

    tests: Build eagain-cli with correct libraries
    
     * Add -ldl -lpthread to linker flags
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

commit 4670344db4dd5ffd0fb54be922083a81cf5f8c4b
Author: Stef Walter <address@hidden>
Date:   Mon May 30 21:35:25 2011 +0200

    pkcs11: Accept CKR_USER_ALREADY_LOGGED_IN as successful result for PAP Login
    
     * When doing CKF_PROTECTED_AUTHENTICATION_PATH login, accept
       CKR_USER_ALREADY_LOGGED_IN as a successful result.
     * Another code path, or another consumer of the same PKCS#11 module
       may have already logged in.
     * This is what the non PAP code path already does.
    
    Signed-off-by: Nikos Mavrogiannopoulos <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 lib/pkcs11.c            |    4 ++--
 tests/suite/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index a5319e6..f63bec7 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -2057,8 +2057,8 @@ pkcs11_login (pakchois_session_t * pks, const struct 
token_info *info, int so)
    * required. */
   if (info->tinfo.flags & CKF_PROTECTED_AUTHENTICATION_PATH)
     {
-      if (pakchois_login (pks, (so == 0) ? CKU_USER : CKU_SO, NULL, 0) ==
-          CKR_OK)
+      rv = pakchois_login (pks, (so == 0) ? CKU_USER : CKU_SO, NULL, 0);
+      if (rv == CKR_OK || rv == CKR_USER_ALREADY_LOGGED_IN)
         {
           return 0;
         }
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 5a85761..92b67f8 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -67,7 +67,7 @@ nodist_libecore_la_SOURCES = ecore/src/lib/ecore_anim.c 
ecore/src/lib/ecore_app.
        ecore/src/lib/eina_stringshare.c ecore/src/lib/eina_tiler.c 
ecore/src/lib/eina_unicode.c \
        ecore/src/lib/eina_ustrbuf.c ecore/src/lib/eina_ustringshare.c 
ecore/src/lib/eina_value.c
 
-eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm
+eagain_cli_LDADD = $(LDADD) libecore.la -lrt -lm -ldl -lpthread
 nodist_eagain_cli_SOURCES = mini-eagain2.c
 
 noinst_PROGRAMS = eagain-cli


hooks/post-receive
-- 
GNU gnutls