[Openvpn-devel] Do not add leading space to pushed options

Message ID 20221130105609.662402-1-selva.nair@gmail.com
State Accepted
Headers show
Series [Openvpn-devel] Do not add leading space to pushed options | expand

Commit Message

Selva Nair Nov. 30, 2022, 10:56 a.m. UTC
From: Selva Nair <selva.nair@gmail.com>

This makes auth-token push during reneg
consistent with regular PUSH_REPLY.

Signed-off-by: Selva Nair <selva.nair@gmail.com>
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Gert Doering Nov. 30, 2022, 11:59 a.m. UTC | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

"Trivial enough, when you have found the place" :-) - tested, confirmed.


2022-11-30 12:55:38 PUSH: Received control message: 'PUSH_REPLY, auth-tokenSESS_ID'


2022-11-30 12:57:42 PUSH: Received control message: 'PUSH_REPLY,auth-tokenSESS_ID'

Your patch has been applied to the master and release/2.5 branch
(not a "critical bug", but "fixing unintended behaviour", so: bugfix).

commit d0672e7a06437c730e27df645b9b9a5407b44ccf (master)
commit d682c77d5646466693991f0db797432fe5e09c95 (release/2.5)
Author: Selva Nair
Date:   Wed Nov 30 05:56:09 2022 -0500

     Do not add leading space to pushed options

     Signed-off-by: Selva Nair <selva.nair@gmail.com>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20221130105609.662402-1-selva.nair@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg25583.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>

kind regards,

Gert Doering


diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index 92a0bc2d..f8c747d4 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -746,7 +746,7 @@  send_push_reply_auth_token(struct tls_multi *multi)
     /* Construct a mimimal control channel push reply message */
     struct buffer buf = alloc_buf_gc(PUSH_BUNDLE_SIZE, &gc);
-    buf_printf(&buf, "%s, %s", push_reply_cmd, e->option);
+    buf_printf(&buf, "%s,%s", push_reply_cmd, e->option);
     send_control_channel_string_dowork(multi, BSTR(&buf), D_PUSH);