From: tb <tb@openbsd.org>
Date: Wed, 31 Jan 2024 06:46:31 +0000 (+0000)
Subject: proc_parser_mft: fix overloading of error
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=06196e9acf8f0ffa5e459b4049c398b6922e8501;p=openbsd

proc_parser_mft: fix overloading of error

parser.c r1.101 switched the meaning of mft1 and mft2, but did not
fix up the overloading of the error from the temporary file if both
are set.

ok job
---

diff --git a/usr.sbin/rpki-client/parser.c b/usr.sbin/rpki-client/parser.c
index 851b5c5f28a..9ba655336bd 100644
--- a/usr.sbin/rpki-client/parser.c
+++ b/usr.sbin/rpki-client/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.108 2024/01/18 14:34:26 job Exp $ */
+/*	$OpenBSD: parser.c,v 1.109 2024/01/31 06:46:31 tb Exp $ */
 /*
  * Copyright (c) 2019 Claudio Jeker <claudio@openbsd.org>
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -379,8 +379,8 @@ proc_parser_mft(struct entity *entp, struct mft **mp, char **crlfile,
 
 	/* overload error from temp file if it is set */
 	if (mft1 == NULL && mft2 == NULL)
-		if (err2 != NULL)
-			err1 = err2;
+		if (err1 != NULL)
+			err2 = err1;
 
 	r = mft_compare(mft1, mft2);
 	if (r == -1 && mft1 != NULL && mft2 != NULL)