From bd485af6e9bce81eaeb4132496379701215c6555 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sat, 21 Jul 2012 16:29:00 +0200
Subject: make openvpn compile again

---
 AndroidManifest.xml           |  4 ++--
 openvpn/src/openvpn/options.c | 17 ++++++++---------
 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
    */
-- 
cgit v1.2.3