From: Selva Nair <selva.nair@gmail.com>
Date: Fri, 13 Nov 2015 02:41:27 +0000 (-0500)
Subject: Do not hard-code windows systemroot in env_block
X-Git-Tag: v2.4_alpha1~202
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7546cba4761b24f2195034dcd3407aecd43fd3be;p=thirdparty%2Fopenvpn.git

Do not hard-code windows systemroot in env_block

FWIW, fixes trac #500

Signed-off-by: Selva Nair <selva.nair@gmail.com>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1447382487-26031-1-git-send-email-selva.nair@gmail.com>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10492
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/win32.c b/src/openvpn/win32.c
index 7c89a5a9c..d06b41f16 100644
--- a/src/openvpn/win32.c
+++ b/src/openvpn/win32.c
@@ -763,7 +763,12 @@ win_safe_filename (const char *fn)
 static char *
 env_block (const struct env_set *es)
 {
-  char * force_path = "PATH=C:\\Windows\\System32;C:\\WINDOWS;C:\\WINDOWS\\System32\\Wbem";
+  char force_path[256];
+  char *sysroot = get_win_sys_path();
+
+  if (!openvpn_snprintf(force_path, sizeof(force_path), "PATH=%s\\System32;%s;%s\\System32\\Wbem",
+                        sysroot, sysroot, sysroot))
+    msg(M_WARN, "env_block: default path truncated to %s", force_path);
 
   if (es)
     {