Fix compile error on TARGET_ANDROID
PATCH 1/1 Fix compile error on TARGET_ANDROID
Commit 3132bead49 accidentially was submitted with a missing semicolon at the end of the line. Whoops.
--- src/openvpn/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
src/openvpn/socket.c +1 -1
@@ -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
Signature · 1 line
2.39.2 (Apple Git-143)
Am 17.04.23 um 15:40 schrieb Arne Schwabe:
Quoted 13 lines
Commit
3132bead49accidentially was submitted with a missing semicolon at the end of the line. Whoops.Signed-off-by Arne Schwabe <[email protected]...>--- src/openvpn/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)src/openvpn/socket.c +0
-0
src/openvpn/socket.c protect_fd_nonlocal(int fd, const struct sockaddr *addr) · line 1171
Quoted 8 lines
src/openvpn/socket.c +1
-1@@ -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:
src/openvpn/route.c +1 -1
@@ -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 */
"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 <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg26593.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering