Merge branch 'feat_misc' into beta2.2

Conflicts:
	Makefile.am
	- Copyright update
	- Added configure.h to CLEANFILES
	options.c
	- Copyright update
	- More verbose information about enabled features

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

1 files changed, 1 insertions, 1 deletions

diff --git a/socket.c b/socket.c
index d5bbb1b..8f9d17d 100644
--- a/socket.c
+++ b/socket.c
@@ -1695,7 +1695,7 @@ link_socket_connection_initiated (const struct buffer *buf,
       struct argv argv = argv_new ();
       setenv_str (es, "script_type", "ipchange");
       ipchange_fmt (true, &argv, info, &gc);
-      openvpn_execve_check (&argv, es, S_SCRIPT, "ip-change command failed");
+      openvpn_run_script (&argv, es, 0, "--ipchange");
       argv_reset (&argv);
     }