summaryrefslogtreecommitdiffstats
path: root/src/openvpn/ssl.c
diff options
context:
space:
mode:
authorSteffan Karger <steffan@karger.me>2015-05-23 15:02:25 +0200
committerGert Doering <gert@greenie.muc.de>2015-05-23 21:20:32 +0200
commitac1cb5bfbb9e09e79fd737bc57999d968d77c5ad (patch)
treedf5ee440e253583635033980e83210ae2fdad646 /src/openvpn/ssl.c
parent970c4bd2e473f625699bd56db44c1970a9e10ed9 (diff)
downloadopenvpn-ac1cb5bfbb9e09e79fd737bc57999d968d77c5ad.tar.gz
openvpn-ac1cb5bfbb9e09e79fd737bc57999d968d77c5ad.tar.xz
openvpn-ac1cb5bfbb9e09e79fd737bc57999d968d77c5ad.zip
Re-read auth-user-pass file on (re)connect if required
Fixes trac #225 ('--auth-user-pass FILE' and '--auth-nocache' problem). This patch is based on the changes suggested by ye_olde_iron in the trac ticket. Also added a note to the manpage to inform people to use absolute paths when combining --auth-user-pass file and --auth-nocache. Signed-off-by: Steffan Karger <steffan@karger.me> Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1432386145-15045-1-git-send-email-steffan@karger.me> URL: http://article.gmane.org/gmane.network.openvpn.devel/9717 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/ssl.c')
-rw-r--r--src/openvpn/ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index dce6c30..ebb2f0d 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1920,9 +1920,9 @@ key_method_2_write (struct buffer *buf, struct tls_session *session)
if (auth_user_pass_enabled)
{
#ifdef ENABLE_CLIENT_CR
- auth_user_pass_setup (NULL, session->opt->sci);
+ auth_user_pass_setup (session->opt->auth_user_pass_file, session->opt->sci);
#else
- auth_user_pass_setup (NULL, NULL);
+ auth_user_pass_setup (session->opt->auth_user_pass_file, NULL);
#endif
if (!write_string (buf, auth_user_pass.username, -1))
goto error;