summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <shade@chemlab.org>2010-09-02 12:33:19 +0000
committerGerrit Code Review <gerrit2@cyanogenmod.teamdouche.net>2010-09-02 12:33:19 +0000
commit7aa3eb089ec1b6d07624ec87e0f1153b4435088e (patch)
tree1f5460ba335873d7718b1a3775a17c9d2782096b
parentd2df764275422f61c7fb2e50ce1f4b98f5bfb5ce (diff)
parentcc1359b23b382ccac5719d595bfcd4b11d94dd98 (diff)
downloadframeworks_base-7aa3eb089ec1b6d07624ec87e0f1153b4435088e.zip
frameworks_base-7aa3eb089ec1b6d07624ec87e0f1153b4435088e.tar.gz
frameworks_base-7aa3eb089ec1b6d07624ec87e0f1153b4435088e.tar.bz2
Merge "openvpn --remote should use host name instead of ip address" into froyo
-rw-r--r--packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
index 82c24e3..487e51b 100644
--- a/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
+++ b/packages/VpnServices/src/com/android/server/vpn/OpenvpnService.java
@@ -68,7 +68,7 @@ class OpenvpnService extends VpnService<OpenvpnProfile> {
args.add("tun");
}
args.add("--remote");
- args.add(serverIp);
+ args.add(getProfile().getServerName());
args.add("--nobind");
args.add("--proto");
args.add(p.getProto());