From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Thu, 16 Jun 2011 18:42:11 +0000 (+0200)
Subject: Enforce the GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO even if GNUTLS_PKCS11_OBJ_FLAG_LOGIN... 
X-Git-Tag: gnutls_2_99_3~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=74aa94137cc28a8906e29037279c52f8a46ca716;p=thirdparty%2Fgnutls.git

Enforce the GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO even if GNUTLS_PKCS11_OBJ_FLAG_LOGIN is specified.
---

diff --git a/lib/pkcs11.c b/lib/pkcs11.c
index 3e030a4338..41126dd970 100644
--- a/lib/pkcs11.c
+++ b/lib/pkcs11.c
@@ -1396,7 +1396,7 @@ pkcs11_obj_flags_to_int (unsigned int flags)
 
   if (flags & GNUTLS_PKCS11_OBJ_FLAG_LOGIN)
     ret_flags |= SESSION_LOGIN;
-  else if (flags & GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO)
+  if (flags & GNUTLS_PKCS11_OBJ_FLAG_LOGIN_SO)
     ret_flags |= SESSION_LOGIN|SESSION_SO;
 
   return ret_flags;