[gnome-keyring/dbus-api] [daemon] Load secret-store component when starting daemon.

[Stefan Walter <stefw src gnome org>]

commit 96a6ea0472febb9f52c41a76d203858473774af2
Author: Stef Walter <stef memberwebs com>
Date:   Sat Aug 22 01:13:20 2009 +0000

    [daemon] Load secret-store component when starting daemon.
    
    Load the secret-store PKCS#11 component.

 daemon/Makefile.am                |    1 +
 daemon/pkcs11/gkr-pkcs11-daemon.c |    8 +++++++-
 2 files changed, 8 insertions(+), 1 deletions(-)
---
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 4de2940..b3759a3 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -38,6 +38,7 @@ gnome_keyring_daemon_LDADD = \
 	$(top_builddir)/pkcs11/plex-layer/libgck-plex-layer.la \
 	$(top_builddir)/pkcs11/roots-store/libgck-roots-store.la \
 	$(top_builddir)/pkcs11/rpc-layer/libgck-rpc-layer.la \
+	$(top_builddir)/pkcs11/secret-store/libgck-secret-store.la \
 	$(top_builddir)/pkcs11/ssh-agent/libgck-ssh-agent.la \
 	$(top_builddir)/pkcs11/ssh-store/libgck-ssh-store.la \
 	$(top_builddir)/pkcs11/user-store/libgck-user-store.la \
diff --git a/daemon/pkcs11/gkr-pkcs11-daemon.c b/daemon/pkcs11/gkr-pkcs11-daemon.c
index 8a213b7..d7bc067 100644
--- a/daemon/pkcs11/gkr-pkcs11-daemon.c
+++ b/daemon/pkcs11/gkr-pkcs11-daemon.c
@@ -27,6 +27,7 @@
 #include "pkcs11/plex-layer/gck-plex-layer.h"
 #include "pkcs11/roots-store/gck-roots-store.h"
 #include "pkcs11/rpc-layer/gck-rpc-layer.h"
+#include "pkcs11/secret-store/gck-secret-store.h"
 #include "pkcs11/ssh-agent/gck-ssh-agent.h"
 #include "pkcs11/ssh-store/gck-ssh-store.h"
 #include "pkcs11/user-store/gck-user-store.h"
@@ -74,7 +75,8 @@ gboolean
 gkr_pkcs11_daemon_initialize (void)
 {
 	CK_FUNCTION_LIST_PTR plex_layer;
-	CK_FUNCTION_LIST_PTR roots_store; 
+	CK_FUNCTION_LIST_PTR roots_store;
+	CK_FUNCTION_LIST_PTR secret_store;
 	CK_FUNCTION_LIST_PTR ssh_store;
 	CK_FUNCTION_LIST_PTR user_store;
 	CK_RV rv;
@@ -82,6 +84,9 @@ gkr_pkcs11_daemon_initialize (void)
 	/* Now initialize them all */
 	gkr_daemon_async_begin_concurrent ();
 
+		/* Secrets */
+		secret_store = gck_secret_store_get_functions ();
+
 		/* SSH storage */
 		ssh_store = gck_ssh_store_get_functions ();
 		
@@ -96,6 +101,7 @@ gkr_pkcs11_daemon_initialize (void)
 #ifdef ROOT_CERTIFICATES
 		gck_plex_layer_add_module (roots_store);
 #endif
+		gck_plex_layer_add_module (secret_store);
 		gck_plex_layer_add_module (user_store);
 		
 		plex_layer = gck_plex_layer_get_functions ();