Skip to contentSkip to conversation

Fix building with --disable-management

PATCH In review Arne Schwabe 2 participants 3 messages Oct 8, 2018

lore
Share & tools
lore

Arne Schwabe

author
#0 lore raw

PATCH 1/1 Fix building with --disable-management

---
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/push.c +1 -1
index 9075d63b..af6d44f7 100644
@@ -177,7 +177,6 @@ server_pushed_signal(struct context *c, const struct buffer *buffer, const bool
 
 void server_pushed_info(struct context *c, const struct buffer *buffer, const int adv)
 {
-  struct gc_arena gc;
   const char *m = "";
   struct buffer buf = *buffer;
 

@@ -187,6 +186,7 @@ void server_pushed_info(struct context *c, const struct buffer *buffer, const in
     }
 
     #ifdef ENABLE_MANAGEMENT
+    struct gc_arena gc;
     if (management)
     {
         gc = gc_new();
Signature · 1 line
2.19.0
#1 lore raw

Hi,

Quoted 8 lines · Arne Schwabe
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/push.c +0 -0
index 9075d63b..af6d44f7 100644

src/openvpn/push.c server_pushed_signal(struct context *c, const struct buffer *buffer, const bool · line 181

Quoted 6 lines
src/openvpn/push.c +0 -1
@@ -177,7 +177,6 @@ server_pushed_signal(struct context *c, const struct buffer *buffer, const bool
 
 void server_pushed_info(struct context *c, const struct buffer *buffer, const int adv)
 {
-  struct gc_arena gc;
   const char *m = "";
   struct buffer buf = *buffer;

Not sure which branch this is coming from...

$ git branch -v
* master      674b1664 build: Fix build warnings related to get_random()
$ git grep server_pushed_info
$ git checkout -  
Switched to branch 'release/2.4'
Your branch is up to date with 'stable/release/2.4'.
$ git grep server_pushed_info
$

... but it does not seem to be anything official...?

*scratch head*

gert

Signature · 6 lines
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             [email protected]...
author
#2 lore raw

Am 08.10.18 um 20:56 schrieb Gert Doering:

Quoted 29 lines

Hi,

Quoted 8 lines · Arne Schwabe
 src/openvpn/push.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/push.c +0 -0
index 9075d63b..af6d44f7 100644

src/openvpn/push.c server_pushed_signal(struct context *c, const struct buffer *buffer, const bool · line 181

Quoted 6 lines
src/openvpn/push.c +0 -1
@@ -177,7 +177,6 @@ server_pushed_signal(struct context *c, const struct buffer *buffer, const bool
 
 void server_pushed_info(struct context *c, const struct buffer *buffer, const int adv)
 {
-  struct gc_arena gc;
   const char *m = "";
   struct buffer buf = *buffer;

Not sure which branch this is coming from...

$ git branch -v
* master      674b1664 build: Fix build warnings related to get_random()
$ git grep server_pushed_info
$ git checkout -  
Switched to branch 'release/2.4'
Your branch is up to date with 'stable/release/2.4'.
$ git grep server_pushed_info
$
Quoted 2 lines

... but it does not seem to be anything official...?

Sorry. I will resend the right patch.

Arne