From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 10 Aug 2020 14:36:54 +0000 (+0200)
Subject: Minor cleanup in push.c
X-Git-Tag: v2.5_beta1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2fdd332979a69d6064706ba3bb875385333b6720;p=thirdparty%2Fopenvpn.git

Minor cleanup in push.c

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200810143707.5834-5-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg20678.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/push.c b/src/openvpn/push.c
index f10021f85..e0d2eeaf2 100644
--- a/src/openvpn/push.c
+++ b/src/openvpn/push.c
@@ -330,15 +330,12 @@ incoming_push_message(struct context *c, const struct buffer *buffer)
 {
     struct gc_arena gc = gc_new();
     unsigned int option_types_found = 0;
-    int status;
 
     msg(D_PUSH, "PUSH: Received control message: '%s'", sanitize_control_message(BSTR(buffer), &gc));
 
-    status = process_incoming_push_msg(c,
-                                       buffer,
-                                       c->options.pull,
-                                       pull_permission_mask(c),
-                                       &option_types_found);
+    int status = process_incoming_push_msg(c, buffer, c->options.pull,
+                                           pull_permission_mask(c),
+                                           &option_types_found);
 
     if (status == PUSH_MSG_ERROR)
     {
@@ -866,7 +863,7 @@ process_incoming_push_msg(struct context *c,
         return process_incoming_push_request(c);
     }
     else if (honor_received_options
-             && buf_string_compare_advance(&buf, "PUSH_REPLY"))
+             && buf_string_compare_advance(&buf, push_reply_cmd))
     {
         return process_incoming_push_reply(c, permission_mask,
                                            option_types_found, &buf);