From: Gert Doering Date: Tue, 4 Aug 2015 12:53:16 +0000 (+0200) Subject: Un-break --auth-user-pass on windows X-Git-Tag: v2.3.9~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a1bb0f40f660efaabd7ee2a857791da6254337d;p=thirdparty%2Fopenvpn.git Un-break --auth-user-pass on windows Commit b131c7b974d9d4d3f0 introduced a check to create a meaningful warning if we try to read a password after daemon()izing (by checking whether stdin or stderr is connected to a tty). For some reason this breaks on Windows builds if run under GUI control - but since Windows doesn't have this particular daemon() issue anyway, just #ifndef WIN32 the offending code. Signed-off-by: Gert Doering Acked-by: Steffan Karger Message-Id: <1438692796-14663-1-git-send-email-gert@greenie.muc.de> URL: http://article.gmane.org/gmane.network.openvpn.devel/10000 (cherry picked from commit 0ffd744332f51878c4df430ab14aca3126bdfc8a) --- diff --git a/src/openvpn/misc.c b/src/openvpn/misc.c index 21e54b483..f20d05921 100644 --- a/src/openvpn/misc.c +++ b/src/openvpn/misc.c @@ -1088,9 +1088,11 @@ get_user_pass_cr (struct user_pass *up, */ else if (from_stdin) { +#ifndef WIN32 /* did we --daemon'ize before asking for passwords? */ if ( !isatty(0) && !isatty(2) ) { msg(M_FATAL, "neither stdin nor stderr are a tty device, can't ask for %s password. If you used --daemon, you need to use --askpass to make passphrase-protected keys work, and you can not use --auth-nocache.", prefix ); } +#endif #ifdef ENABLE_CLIENT_CR if (auth_challenge && (flags & GET_USER_PASS_DYNAMIC_CHALLENGE))