diff options
| author | Stef Walter <stefw@gnome.org> | 2014-03-06 16:10:04 +0100 |
|---|---|---|
| committer | Stef Walter <stefw@gnome.org> | 2014-03-06 18:40:24 +0100 |
| commit | cad5ed78f44e8546df2c824aa7b3b5e660a32d61 (patch) | |
| tree | 58746f5918fedb8091f2f7d426f9807ee6dc4970 | |
| parent | 7941abe62bf7a0f26b92095d930e7872a970e948 (diff) | |
daemon: More indicative preconditions when startup ordering goes bad
| -rw-r--r-- | daemon/dbus/gkd-dbus-secrets.c | 6 | ||||
| -rw-r--r-- | daemon/login/gkd-login.c | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/daemon/dbus/gkd-dbus-secrets.c b/daemon/dbus/gkd-dbus-secrets.c index 2b7808e8..58e0a8fb 100644 --- a/daemon/dbus/gkd-dbus-secrets.c +++ b/daemon/dbus/gkd-dbus-secrets.c @@ -43,9 +43,13 @@ calculate_secrets_slot (void) GckModule *module; GList *modules; GError *err = NULL; + CK_FUNCTION_LIST_PTR funcs; /* TODO: Should we be handling just one module here? */ - module = gck_module_new (gkd_pkcs11_get_functions ()); + funcs = gkd_pkcs11_get_functions (); + g_return_val_if_fail (funcs != NULL, NULL); + + module = gck_module_new (funcs); g_return_val_if_fail (module, NULL); modules = g_list_prepend (NULL, module); diff --git a/daemon/login/gkd-login.c b/daemon/login/gkd-login.c index bf208241..2c0cb20c 100644 --- a/daemon/login/gkd-login.c +++ b/daemon/login/gkd-login.c @@ -39,7 +39,13 @@ static GList* module_instances (void) { - GckModule *module = gck_module_new (gkd_pkcs11_get_base_functions ()); + CK_FUNCTION_LIST_PTR funcs; + GckModule *module; + + funcs = gkd_pkcs11_get_base_functions (); + g_return_val_if_fail (funcs != NULL && "instances", NULL); + + module = gck_module_new (funcs); g_return_val_if_fail (module, NULL); return g_list_append (NULL, module); } |