summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2012-07-21 16:29:00 +0200
committerArne Schwabe <arne@rfc2549.org>2012-07-21 16:29:00 +0200
commita662c9101eb0aef7aa3061f62096a407c170a9dd (patch)
tree9811bb6b75e298e02d5d8467114fd1612bf8feed
parent5f1cef9bf058f3c7b08b827ee9567a8fc648057a (diff)
make openvpn compile again
-rw-r--r--AndroidManifest.xml4
-rw-r--r--openvpn/src/openvpn/options.c17
2 files changed, 10 insertions, 11 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a41fc790..4a694c0b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -17,8 +17,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="de.blinkt.openvpn"
- android:versionCode="40"
- android:versionName="0.5.14" >
+ android:versionCode="41"
+ android:versionName="0.5.15" >
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/openvpn/src/openvpn/options.c b/openvpn/src/openvpn/options.c
index 44b38bed..0e7d971a 100644
--- a/openvpn/src/openvpn/options.c
+++ b/openvpn/src/openvpn/options.c
@@ -1932,15 +1932,6 @@ options_postprocess_verify_ce (const struct options *options, const struct conne
if ((options->management_client_user || options->management_client_group)
&& !(options->management_flags & MF_UNIX_SOCK))
msg (M_USAGE, "--management-client-(user|group) can only be used on unix domain sockets");
-#ifdef MANAGMENT_EXTERNAL_KEY
- if(options->management_flags & MF_EXTERNAL_KEY) {
- if(options->priv_key_file)
- msg (M_USAGE, "--key and --management-external-key are mutually exclusive");
- /* set a filename for nicer output in the logs */
- options->priv_key_file = "EXTERNAL_PRIVATE_KEY";
- }
-#endif
-
#endif
/*
@@ -2366,6 +2357,14 @@ options_postprocess_mutate_ce (struct options *o, struct connection_entry *ce)
#endif
}
+#ifdef MANAGMENT_EXTERNAL_KEY
+ if(o->management_flags & MF_EXTERNAL_KEY) {
+ if(o->priv_key_file)
+ msg (M_USAGE, "--key and --management-external-key are mutually exclusive");
+ /* set a filename for nicer output in the logs */
+ o->priv_key_file = "EXTERNAL_PRIVATE_KEY";
+ }
+#endif
/*
* Set MTU defaults
*/