Remove useless empty line from CR_RESPONSE message

The out buffer is not filled and this adds an extra empty line for
CR_RESPONSE outputs. Also make minor style fixes.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20220530224149.201883-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24447.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 0dbcaba4f301c21e68a5cd032a4b56eb75c17c37)

diff --git a/src/openvpn/manage.c b/src/openvpn/manage.c
index 1511fd85db857fdbd9a24673dd298e73e1b1fd01..0b9e92b6b9a252d3c7ab3ad758b82cb18832a62a 100644 (file)
--- a/src/openvpn/manage.c
+++ b/src/openvpn/manage.c
@@ -2970,17 +2970,14 @@ management_notify_client_cr_response(unsigned mda_key_id,
     {
         gc = gc_new();
 
-        struct buffer out = alloc_buf_gc(256, &gc);
         msg(M_CLIENT, ">CLIENT:CR_RESPONSE,%lu,%u,%s",
             mdac->cid, mda_key_id, response);
         man_output_extra_env(management, "CLIENT");
-        if (management->connection.env_filter_level>0)
+        if (management->connection.env_filter_level > 0)
         {
             man_output_peer_info_env(management, mdac);
         }
         man_output_env(es, true, management->connection.env_filter_level, "CLIENT");
-        management_notify_generic(management, BSTR(&out));
-
         gc_free(&gc);
     }
 }

diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index fab1d5f43be7d898cc87c4fa38e54d232e2dffc9..7c36530d06160e1e458520949c9b5783e056a90d 100644 (file)
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -225,7 +225,6 @@ receive_cr_response(struct context *c, const struct buffer *buffer)
     struct env_set *es = session->opt->es;
     int key_id = session->key[KS_PRIMARY].key_id;
 
-
     management_notify_client_cr_response(key_id, mda, es, m);
 #endif
     msg(D_PUSH, "CR response was sent by client ('%s')", m);