[Openvpn-devel,v1] dco.c: fix argument order in dco_install_key() log string

Message ID 20260701074122.28795-1-gert@greenie.muc.de
State New
Headers
Series [Openvpn-devel,v1] dco.c: fix argument order in dco_install_key() log string |

Commit Message

Gert Doering July 1, 2026, 7:41 a.m. UTC
  From: Ralf Lici <ralf@mandelbit.com>

The debug log in dco_install_key() has the epoch and dco_keys_installed
arguments swapped. So a line like epoch=1, currently 0 keys installed
actually means dco_keys_installed == 1 and epoch == false.

Use the correct argument ordering in the log string.

Change-Id: Id8945dce437da11e6fecae9550c3be52e393d4cf
Signed-off-by: Ralf Lici <ralf@mandelbit.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760
---

This change was reviewed on Gerrit and approved by at least one
developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <gert@greenie.muc.de>
  

Comments

Gert Doering July 1, 2026, 7:53 a.m. UTC | #1
"Obviously correct".  Fascinating oversight on the original change...

Your patch has been applied to the master and release/2.7 branch.

commit cda2f2533c27f37cfe7a741c9e042a54740e377f (master)
commit 097d259e3702a5b621399eee9b83e79fc9a577bc (release/2.7)
Author: Ralf Lici
Date:   Wed Jul 1 09:41:15 2026 +0200

     dco.c: fix argument order in dco_install_key() log string

     Signed-off-by: Ralf Lici <ralf@mandelbit.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1760
     Message-Id: <20260701074122.28795-1-gert@greenie.muc.de>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg37418.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
  

Patch

diff --git a/src/openvpn/dco.c b/src/openvpn/dco.c
index f5b7081..e944547 100644
--- a/src/openvpn/dco.c
+++ b/src/openvpn/dco.c
@@ -57,8 +57,8 @@ 
 
 {
     bool epoch = ks->crypto_options.flags & CO_EPOCH_DATA_KEY_FORMAT;
-    msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d epoch=%d, currently %d keys installed", __func__,
-        multi->dco_peer_id, ks->key_id, multi->dco_keys_installed, epoch);
+    msg(D_DCO_DEBUG, "%s: peer_id=%d keyid=%d epoch=%d, currently %d keys installed",
+        __func__, multi->dco_peer_id, ks->key_id, epoch, multi->dco_keys_installed);
 
     /* Install a key in the PRIMARY slot only when no other key exist.
      * From that moment on, any new key will be installed in the SECONDARY