summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Schmidt <mschmidt@redhat.com>2014-12-10 16:37:29 +0100
committerMichal Schmidt <mschmidt@redhat.com>2014-12-13 00:47:23 +0100
commit2df65e7d964295f2763fae3b8bc3ade5d4e0fbe3 (patch)
tree9faf22a4747c401dd4f8b7cc8ca38575c19de372
parentd3d3208f607693b8fde5226efa0cc15ec17670a0 (diff)
journal: consistently allow type==0 to mean "any type"
If type==0 and a non-NULL object were given as arguments to journal_file_hmac_put_object(), its object type check would fail and it would return -EBADMSG. All existing callers use either a positive type or -1. Still, for behavior consistency with journal_file_move_to_object() let's allow type 0 to pass.
-rw-r--r--src/journal/journal-authenticate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journal-authenticate.c b/src/journal/journal-authenticate.c
index f9bd686c11..fd3b82134f 100644
--- a/src/journal/journal-authenticate.c
+++ b/src/journal/journal-authenticate.c
@@ -246,7 +246,7 @@ int journal_file_hmac_put_object(JournalFile *f, int type, Object *o, uint64_t p
if (r < 0)
return r;
} else {
- if (type >= 0 && o->object.type != type)
+ if (type > 0 && o->object.type != type)
return -EBADMSG;
}