| Message ID | 20230417134046.81761-1-arne@rfc2549.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [Openvpn-devel] Fix compile error on TARGET_ANDROID | expand |
Am 17.04.23 um 15:40 schrieb Arne Schwabe: > Commit 3132bead49 accidentially was submitted with a missing semicolon > at the end of the line. Whoops. > > Signed-off-by: Arne Schwabe <arne@rfc2549.org> > --- > src/openvpn/socket.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c > index ab8cc754..fc643c1c 100644 > --- a/src/openvpn/socket.c > +++ b/src/openvpn/socket.c > @@ -1165,7 +1165,7 @@ protect_fd_nonlocal(int fd, const struct sockaddr *addr) > { > if (!management) > { > - msg(M_FATAL, "Required management interface not available.") > + msg(M_FATAL, "Required management interface not available."); > } > > /* pass socket FD to management interface to pass on to VPNService API Note that this patch is uncrusity clean on my own machine but fails on github for some reason. Diff is: --- a/src/openvpn/route.c +++ b/src/openvpn/route.c @@ -1103,7 +1103,7 @@ redirect_default_route_to_vpn(struct route_list *rl, const struct tuntap *tt, ret = add_route3(0, 0, rl->spec.remote_endpoint, tt, flags, &rl->rgi, es, ctx) && ret; } -#endif +#endif /* ifdef TARGET_ANDROID */ } /* set a flag so we can undo later */
Acked-by: Gert Doering <gert@greenie.muc.de> "Obviously correct". Wonder who ACKed and/or merged the offending code... Interesting enough, Uncrustify does not complain here. Your patch has been applied to the master and release/2.6 branch. commit 8d38ed4817f4c1fe1676409c4e5138aaa4a69dfc (master) commit a32f914051909cc5e7692964af169fc3224270e5 (release/2.6) Author: Arne Schwabe Date: Mon Apr 17 15:40:46 2023 +0200 Fix compile error on TARGET_ANDROID Signed-off-by: Arne Schwabe <arne@rfc2549.org> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <20230417134046.81761-1-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26593.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/socket.c b/src/openvpn/socket.c index ab8cc754..fc643c1c 100644 --- a/src/openvpn/socket.c +++ b/src/openvpn/socket.c @@ -1165,7 +1165,7 @@ protect_fd_nonlocal(int fd, const struct sockaddr *addr) { if (!management) { - msg(M_FATAL, "Required management interface not available.") + msg(M_FATAL, "Required management interface not available."); } /* pass socket FD to management interface to pass on to VPNService API
Commit 3132bead49 accidentially was submitted with a missing semicolon at the end of the line. Whoops. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)