Merge branch 'svn-branch-2.1' into merge

Pulling in changes from James' 2.1/openvpn branch in SVN.

Conflicts:
	buffer.c
	init.c
	manage.h
	multi.c
	openvpn.8
	options.c
	ssl.c
	version.m4
	win/sign.py

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

1 files changed, 8 insertions, 4 deletions

diff --git a/win/sign.py b/win/sign.py
index 67d1cbc..a80bf98 100644
--- a/win/sign.py
+++ b/win/sign.py
@@ -4,16 +4,20 @@ from wb import config, choose_arch, home_fn
 if 'SIGNTOOL' in config:
     sys.path.append(home_fn(config['SIGNTOOL']))
 
-def main(conf, arch):
+def main(conf, arch, tap_dir):
     from signtool import SignTool
-    st = SignTool(conf)
+    st = SignTool(conf, tap_dir)
     for x64 in choose_arch(arch):
         st.sign_verify(x64=x64)
 
 # if we are run directly, and not loaded as a module
 if __name__ == "__main__":
     if len(sys.argv) >= 2:
-        main(config, sys.argv[1])
+        if len(sys.argv) >= 3:
+            tap_dir = home_fn(sys.argv[2])
+        else:
+            tap_dir = None
+        main(config, sys.argv[1], tap_dir)
     else:
-        print "usage: sign <x64|x86|all>"
+        print "usage: sign <x64|x86|all> [tap-dir]"
         sys.exit(2)