diff options
| author | Parménides GV <parmegv@ma.sdf.org> | 2013-06-24 19:37:35 +0200 |
|---|---|---|
| committer | Parménides GV <parmegv@ma.sdf.org> | 2013-06-24 19:37:35 +0200 |
| commit | 50db5b5816476751f39bb7b8adc927562a0cc677 (patch) | |
| tree | fa8fc602518430137895fbdbaba439f6c3d92321 /src/se/leap/openvpn/ConfigParser.java | |
| parent | 195d5ab2d518f6f3960edd3c636e941830c2664d (diff) | |
| parent | 304b29d6cb85d710756a56bc9c009429b8407d69 (diff) | |
Merge branch 'feature/eip' into develop
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"); |