Hi, while this patch looks reasonable, and I was just to ACK and merge it, it confuses me just so slightly - if I look into my copy of push.c, "git blame" tells me that these two lines in there already, and have been so "since ever":
^6fbf66f push.c (James Yonan 2005-09-26 05:28:27 +0000 71) #ifdef ENABLE_MANAGEMENT ^6fbf66f push.c (James Yonan 2005-09-26 05:28:27 +0000 72) if (management) 5733ef66 push.c (James Yonan 2009-09-29 23:10:14 +0000 73) { ... 8c7c6be4 push.c (James Yonan 2010-03-12 03:05:34 +0000 78) management_auth_failure (management, UP_TYPE_AUTH, reason); 3cf9dd88 push.c (James Yonan 2010-10-24 09:12:47 +0000 79) } else ^6fbf66f push.c (James Yonan 2005-09-26 05:28:27 +0000 80) #endif ... could you double check your tree, please? ;-) gert On Mon, Jul 07, 2014 at 02:12:21PM +0200, Arne Schwabe wrote: > --- > src/openvpn/push.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/src/openvpn/push.c b/src/openvpn/push.c > index ea788b0..24d12c7 100644 > --- a/src/openvpn/push.c > +++ b/src/openvpn/push.c > @@ -68,6 +68,7 @@ receive_auth_failed (struct context *c, const struct buffer > *buffer) > ASSERT (0); > } > c->sig->signal_text = "auth-failure"; > +#ifdef ENABLE_MANAGEMENT > if (management) > { > const char *reason = NULL; > @@ -76,6 +77,7 @@ receive_auth_failed (struct context *c, const struct buffer > *buffer) > reason = BSTR (&buf); > management_auth_failure (management, UP_TYPE_AUTH, reason); > } else > +#endif > { > #ifdef ENABLE_CLIENT_CR > struct buffer buf = *buffer; > -- > 1.8.5.2 (Apple Git-48) > > > ------------------------------------------------------------------------------ > Open source business process management suite built on Java and Eclipse > Turn processes into business applications with Bonita BPM Community Edition > Quickly connect people, data, and systems into organized workflows > Winner of BOSSIE, CODIE, OW2 and Gartner awards > http://p.sf.net/sfu/Bonitasoft > _______________________________________________ > Openvpn-devel mailing list > Openvpn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/openvpn-devel > -- USENET is *not* the non-clickable part of WWW! //www.muc.de/~gert/ Gert Doering - Munich, Germany g...@greenie.muc.de fax: +49-89-35655025 g...@net.informatik.tu-muenchen.de
pgpvYLb2Xh1Kg.pgp
Description: PGP signature