From: Frank Lichtenheld Date: Thu, 16 Oct 2025 10:33:03 +0000 (+0200) Subject: init: Fix datav2_enabled check in options import X-Git-Tag: v2.7_rc1~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c124e50317e530394d9011ddde5653ccfdd94482;p=thirdparty%2Fopenvpn.git init: Fix datav2_enabled check in options import peer_id is unsigned, so the previous check was partly useless. Instead check use_peer_id. Change-Id: Ia713a2ecfcad7032863867630a0c306ff9f90385 Signed-off-by: Frank Lichtenheld Acked-by: Arne Schwabe Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1273 Message-Id: <20251016103308.4685-1-gert@greenie.muc.de> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg33365.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/init.c b/src/openvpn/init.c index aaa05737b..aa2611dbc 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -2728,8 +2728,8 @@ do_deferred_options(struct context *c, const unsigned int found, const bool is_u /* Ensure that for epoch data format is only enabled if also data v2 * is enabled */ - bool epoch_data = (c->options.imported_protocol_flags & CO_EPOCH_DATA_KEY_FORMAT); - bool datav2_enabled = (c->options.peer_id >= 0 && c->options.peer_id < MAX_PEER_ID); + bool epoch_data = c->options.imported_protocol_flags & CO_EPOCH_DATA_KEY_FORMAT; + bool datav2_enabled = c->options.use_peer_id && c->options.peer_id < MAX_PEER_ID; if (epoch_data && !datav2_enabled) {