Hi, On Thu, Apr 04, 2019 at 01:16:56PM +0200, Christopher Schenk wrote: > Signed-off-by: Christopher Schenk <csch...@mail.uni-paderborn.de> > --- > include/openvpn-msg.h | 8 ++++ > src/openvpn/tun.c | 89 +++++++++++++++++++++++++++++++++++ > src/openvpnserv/interactive.c | 31 ++++++++++++ > 3 files changed, 128 insertions(+)
So, we have this nice patch, and I got a very pointed reminder today that I messed merging it up. The patch has an ACK, so everything is good, but Lev and Simon whacked tun.c a lot in between, and someone else added message types, so it does not apply anymore. Applying: Set the correct mtu on windows based systems error: patch failed: include/openvpn-msg.h:39 error: include/openvpn-msg.h: patch does not apply error: patch failed: src/openvpn/tun.c:984 error: src/openvpn/tun.c: patch does not apply error: patch failed: src/openvpnserv/interactive.c:1198 error: src/openvpnserv/interactive.c: patch does not apply Patch failed at 0001 Set the correct mtu on windows based systems Would you accept an apology for me dragging my feet on this for so long, and send a rebased v3 to current master? (And if that does not get traction, feel free to send Max my way on a weekly basis) gert -- "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 g...@greenie.muc.de
signature.asc
Description: PGP signature
_______________________________________________ Openvpn-devel mailing list Openvpn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openvpn-devel