diff options
| author | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:33:16 +0200 |
|---|---|---|
| committer | David Sommerseth <dazo@users.sourceforge.net> | 2010-07-22 22:33:16 +0200 |
| commit | 0b026a985d6232d459ed4e2b6642853c959667da (patch) | |
| tree | a43bbe677b158de41f32bb240358ec4c1d2f34b2 /common.h | |
| parent | c70135d8ed31d133f2fb085bee01db8ad26d7fec (diff) | |
| parent | 031d18fcb8a2a552aecabb41f1afdfe3f51bdd58 (diff) | |
| download | openvpn-0b026a985d6232d459ed4e2b6642853c959667da.tar.gz openvpn-0b026a985d6232d459ed4e2b6642853c959667da.tar.xz openvpn-0b026a985d6232d459ed4e2b6642853c959667da.zip | |
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>
Diffstat (limited to 'common.h')
| -rw-r--r-- | common.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -97,6 +97,6 @@ typedef unsigned long ptr_type; /* * Script security warning */ -#define SCRIPT_SECURITY_WARNING "openvpn_execve: external program may not be called unless '--script-security 2' or higher is enabled. Use '--script-security 3 system' for backward compatibility with 2.1_rc8 and earlier. See --help text or man page for detailed info." +#define SCRIPT_SECURITY_WARNING "WARNING: External program may not be called unless '--script-security 2' or higher is enabled. Use '--script-security 3 system' for backward compatibility with 2.1_rc8 and earlier. See --help text or man page for detailed info." #endif |