diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:30:24 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-07-26 15:30:24 -0600 |
| commit | f49967fb3f24bf0a22d09b5823bd174a45e758f7 (patch) | |
| tree | 7fefe9ec3aeff998c5dd99861428717a2c5f3a41 /src/se/leap/openvpn/ConfigParser.java | |
| parent | 8dbb4517b07c42c3b37b0764d63973b5b1ed5ee6 (diff) | |
| parent | b69c9a87f60e649221c8f83d58bbd57b35a64aca (diff) | |
Merge branch 'release-0.2.0'0.2.0
Diffstat (limited to 'src/se/leap/openvpn/ConfigParser.java')
| -rw-r--r-- | src/se/leap/openvpn/ConfigParser.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/se/leap/openvpn/ConfigParser.java b/src/se/leap/openvpn/ConfigParser.java index f57bbae9..3d369fa6 100644 --- a/src/se/leap/openvpn/ConfigParser.java +++ b/src/se/leap/openvpn/ConfigParser.java @@ -47,6 +47,9 @@ public class ConfigParser { options.get(optionname).add(args); } } + public void setDefinition(HashMap<String,Vector<Vector<String>>> args) { + options = args; + } private void checkinlinefile(Vector<String> args, BufferedReader br) throws IOException, ConfigParseError { String arg0 = args.get(0); @@ -247,7 +250,8 @@ public class ConfigParser { // Pull, client, tls-client np.clearDefaults(); - if(options.containsKey("client") || options.containsKey("pull")) { + // XXX we are always client + if(/*options.containsKey("client") || options.containsKey("pull")*/ true) { np.mUsePull=true; options.remove("pull"); options.remove("client"); |