svn commit: lorikeet r597 - in trunk/heimdal/lib/hx509: .

[lha at samba.org]

Author: lha
Date: 2006-10-19 11:03:16 +0000 (Thu, 19 Oct 2006)
New Revision: 597

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=597

Log:
merge from heimdal svn (p11_list_keys): make element of search_data[0] constants and set them later
Modified:
   trunk/heimdal/lib/hx509/ks_p11.c


Changeset:
Modified: trunk/heimdal/lib/hx509/ks_p11.c
===================================================================
--- trunk/heimdal/lib/hx509/ks_p11.c	2006-10-19 07:27:39 UTC (rev 596)
+++ trunk/heimdal/lib/hx509/ks_p11.c	2006-10-19 11:03:16 UTC (rev 597)
@@ -32,7 +32,7 @@
  */
 
 #include "hx_locl.h"
-RCSID("$Id: ks_p11.c,v 1.37 2006/10/16 09:49:05 lha Exp $");
+RCSID("$Id: ks_p11.c,v 1.38 2006/10/19 11:02:01 lha Exp $");
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
@@ -757,7 +757,7 @@
     struct p11_collector ctx;
     CK_OBJECT_CLASS key_class;
     CK_ATTRIBUTE search_data[] = {
-	{CKA_CLASS, &key_class, sizeof(key_class)},
+	{CKA_CLASS, NULL, 0},
     };
     CK_ATTRIBUTE query_data[3] = {
 	{CKA_ID, NULL, 0},
@@ -766,6 +766,9 @@
     };
     int ret;
 
+    search_data[0].pValue = &key_class;
+    search_data[0].ulValueLen = sizeof(key_class);
+
     if (lock == NULL)
 	lock = _hx509_empty_lock;