packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OstreeGpgVerifier: Don't add trustdb.gpg to the keyring list 

In case someone like me is mucking around in $OSTREE_GPG_HOME and
accidentally creates a trust database there.
This commit is contained in:
Matthew Barnes 2015-03-16 09:54:24 -04:00
parent ccbb10d107
commit c4998ab33f
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libostree/ostree-gpg-verifier.c
View File

@ -409,6 +409,7 @@ _ostree_gpg_verifier_add_keyring_dir (OstreeGpgVerifier *self,
{ {
GFileInfo *file_info; GFileInfo *file_info;
GFile *path; GFile *path;
const char *name;
if (!gs_file_enumerator_iterate (enumerator, &file_info, &path, if (!gs_file_enumerator_iterate (enumerator, &file_info, &path,
cancellable, error)) cancellable, error))
@ -416,8 +417,20 @@ _ostree_gpg_verifier_add_keyring_dir (OstreeGpgVerifier *self,
if (file_info == NULL) if (file_info == NULL)
break; break;
if (g_file_info_get_file_type (file_info) == G_FILE_TYPE_REGULAR && if (g_file_info_get_file_type (file_info) != G_FILE_TYPE_REGULAR)
g_str_has_suffix (g_file_info_get_name (file_info), ".gpg")) continue;
name = g_file_info_get_name (file_info);
/* Files with a .gpg suffix are typically keyrings except
* for trustdb.gpg, which is the GPG trust database. */
if (!g_str_has_suffix (name, ".gpg"))
continue;
if (g_str_equal (name, "trustdb.gpg"))
continue;
self->keyrings = g_list_append (self->keyrings, g_object_ref (path)); self->keyrings = g_list_append (self->keyrings, g_object_ref (path));
} }