Package: openvpn
Version: 2.3.4-3
Severity: bug

Please apply given patch to solve this annoying bug, described in
https://community.openvpn.net/openvpn/ticket/225, but still not fixed
upstream.

Patch idea are simple - add additional variable to tls_options structure
to store user passwd file name, set it on init, and on regen time supply
given file name to needed procedure instead of NULL.

Best regards,

Tomas Martišius




Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 openvpn (2.3.4-1~1) unstable; urgency=medium
 .
   * New upstream version.
   * Rebuilt for wheezy.
Author: Tomas Martisius <to...@puga.vdu.lt>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- openvpn-2.3.4.orig/src/openvpn/init.c
+++ openvpn-2.3.4/src/openvpn/init.c
@@ -2240,6 +2240,7 @@ do_init_crypto_tls (struct context *c, c
   to.auth_user_pass_verify_script = options->auth_user_pass_verify_script;
   to.auth_user_pass_verify_script_via_file = options->auth_user_pass_verify_script_via_file;
   to.tmp_dir = options->tmp_dir;
+  to.auth_user_pass_file = options->auth_user_pass_file;
   if (options->ccd_exclusive)
     to.client_config_dir_exclusive = options->client_config_dir;
 #endif
--- openvpn-2.3.4.orig/src/openvpn/ssl_common.h
+++ openvpn-2.3.4/src/openvpn/ssl_common.h
@@ -277,6 +277,7 @@ struct tls_options
   const char *auth_user_pass_verify_script;
   bool auth_user_pass_verify_script_via_file;
   const char *tmp_dir;
+  const char *auth_user_pass_file;
 
   /* use the client-config-dir as a positive authenticator */
   const char *client_config_dir_exclusive;
--- openvpn-2.3.4.orig/src/openvpn/ssl.c
+++ openvpn-2.3.4/src/openvpn/ssl.c
@@ -1898,9 +1898,9 @@ key_method_2_write (struct buffer *buf,
   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;

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to