chiark / gitweb /
journal: consistently allow type==0 to mean "any type"
authorMichal Schmidt <mschmidt@redhat.com>
Wed, 10 Dec 2014 15:37:29 +0000 (16:37 +0100)
committerMichal Schmidt <mschmidt@redhat.com>
Fri, 12 Dec 2014 23:47:23 +0000 (00:47 +0100)
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.

src/journal/journal-authenticate.c

index f9bd686..fd3b821 100644 (file)
@@ -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;
         }