summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2014-07-10 15:09:08 +0200
committerArne Schwabe <arne@rfc2549.org>2014-07-10 15:09:08 +0200
commit1fccb03fca7db86a438d8f24425e9cd776ea23f6 (patch)
tree51c3c37169db15520ded8d0a8cfb30f2a922501c
parentfba9704078ff9ef321131669e9677eb400eb05fb (diff)
Don't warn on ifconfig configuration issuses. The VpnService makes enough warnings.
-rw-r--r--doc/README.txt2
-rw-r--r--main/src/main/java/de/blinkt/openvpn/VpnProfile.java3
2 files changed, 4 insertions, 1 deletions
diff --git a/doc/README.txt b/doc/README.txt
index 8e665bfa..07562bea 100644
--- a/doc/README.txt
+++ b/doc/README.txt
@@ -14,7 +14,7 @@ See the file todo.txt for ideas/not yet implemented features (and the bug track
Build instraction:
-Disable Google breakcode (WITH_BREAKPAD=0 in jni/Android.mk) or checkout google breakcode
+Disable Google breakcode (call build-native.sh with USE_BREAKPAD=0) or checkout google breakcode
svn co http://google-breakpad.googlecode.com/svn/trunk/ google-breakpad
diff --git a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 7e25e79a..7fefa067 100644
--- a/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -228,6 +228,9 @@ public class VpnProfile implements Serializable {
cfg += "machine-readable-output\n";
+ // Users are confused by warnings that are misleading...
+ cfg += "ifconfig-nowarn\n";
+
boolean useTLSClient = (mAuthenticationType != TYPE_STATICKEYS);