From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 12 Jul 2012 15:35:04 +0000 (+0200)
Subject: journal: fix interleaving of files with different time sources
X-Git-Tag: v187~122
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=c4aff78b2dffc1405396bff2458e479d0a19d93b

journal: fix interleaving of files with different time sources
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5420be13e..b6e74a0d4 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -240,7 +240,7 @@ static int compare_order(JournalFile *af, Object *ao,
 
         /* Otherwise compare UTC time */
         a = le64toh(ao->entry.realtime);
-        b = le64toh(ao->entry.realtime);
+        b = le64toh(bo->entry.realtime);
 
         if (a < b)
                 return -1;
@@ -249,7 +249,7 @@ static int compare_order(JournalFile *af, Object *ao,
 
         /* Finally, compare by contents */
         a = le64toh(ao->entry.xor_hash);
-        b = le64toh(ao->entry.xor_hash);
+        b = le64toh(bo->entry.xor_hash);
 
         if (a < b)
                 return -1;