| Message ID | 20181008175044.8289-1-arne@rfc2549.org |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [Openvpn-devel] Fix building with --disable-management | expand |
Hi, On Mon, Oct 08, 2018 at 07:50:44PM +0200, Arne Schwabe wrote: > src/openvpn/push.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/openvpn/push.c b/src/openvpn/push.c > index 9075d63b..af6d44f7 100644 > --- a/src/openvpn/push.c > +++ b/src/openvpn/push.c > @@ -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
Am 08.10.18 um 20:56 schrieb Gert Doering: > Hi, > > On Mon, Oct 08, 2018 at 07:50:44PM +0200, Arne Schwabe wrote: >> src/openvpn/push.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/src/openvpn/push.c b/src/openvpn/push.c >> index 9075d63b..af6d44f7 100644 >> --- a/src/openvpn/push.c >> +++ b/src/openvpn/push.c >> @@ -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...? > Sorry. I will resend the right patch. Arne
diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 9075d63b..af6d44f7 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -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();