diff options
| author | Stef Walter <stef@thewalter.net> | 2013-07-08 18:30:16 +0200 |
|---|---|---|
| committer | Stef Walter <stef@thewalter.net> | 2013-07-08 18:30:16 +0200 |
| commit | c0a2fe9c974b51e7495d0598a925c07744d895de (patch) | |
| tree | c93a052cc070878d66cae6e6b4d86d9d9e259415 | |
| parent | 2c4f5ed657976d868c33f0ddf430477ee2bf0191 (diff) | |
trust: Support token directory paths in user's home directory
| -rw-r--r-- | trust/module.c | 1 | ||||
| -rw-r--r-- | trust/token.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/trust/module.c b/trust/module.c index d2fcba6..25a72b7 100644 --- a/trust/module.c +++ b/trust/module.c @@ -195,6 +195,7 @@ create_tokens_inlock (p11_array *tokens, const char *prefix; const char *label; } labels[] = { + { "~/", "User Trust" }, { DATADIR, "Default Trust" }, { SYSCONFDIR, "System Trust" }, { NULL }, diff --git a/trust/token.c b/trust/token.c index 77ff739..ca24762 100644 --- a/trust/token.c +++ b/trust/token.c @@ -643,7 +643,7 @@ p11_token_new (CK_SLOT_ID slot, token->loaded = p11_dict_new (p11_dict_str_hash, p11_dict_str_equal, free, free); return_val_if_fail (token->loaded != NULL, NULL); - token->path = strdup (path); + token->path = p11_path_expand (path); return_val_if_fail (token->path != NULL, NULL); token->anchors = p11_path_build (token->path, "anchors", NULL); |