summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <blueowl@centrum.cz>2016-11-10 18:47:30 +0100
committerJiří Klimeš <blueowl@centrum.cz>2016-11-10 20:56:44 +0100
commitc391fb299b6d50a513bfa971dde94f03af31b872 (patch)
tree98122cb8a3b669e960c6f2db38bde9632c4ae80f
parent3219bb3b760f6b30f3c049e1fae8fcff55f78b22 (diff)
downloadNetworkManager-c391fb299b6d50a513bfa971dde94f03af31b872.tar.gz
nm-import-openvpn: sort the options alphabetically
-rwxr-xr-xcontrib/scripts/nm-import-openvpn28
1 files changed, 14 insertions, 14 deletions
diff --git a/contrib/scripts/nm-import-openvpn b/contrib/scripts/nm-import-openvpn
index f02575eb4f..0be151c520 100755
--- a/contrib/scripts/nm-import-openvpn
+++ b/contrib/scripts/nm-import-openvpn
@@ -280,42 +280,42 @@ vpn2nm = {
["ca"] = { nm_opt="ca", func=handle_path, tbl=g_vpn_data },
["cert"] = { nm_opt="cert", func=handle_path, tbl=g_vpn_data },
["cipher"] = { nm_opt="cipher", func=handle_generic, tbl=g_vpn_data },
- ["keysize"] = { nm_opt="keysize", func=handle_generic, tbl=g_vpn_data },
- ["keepalive"] = { nm_opt={"ping", "ping-restart"}, func=handle_keepalive, tbl=g_vpn_data },
["client"] = { nm_opt="client", func=set_bool, tbl={} },
["comp-lzo"] = { nm_opt="comp-lzo", func=handle_comp_lzo, tbl=g_vpn_data },
- ["float"] = { nm_opt="float", func=handle_yes, tbl=g_vpn_data },
["dev"] = { nm_opt="dev", func=handle_generic, tbl=g_vpn_data },
["dev-type"] = { nm_opt="dev-type", func=handle_dev_type, tbl=g_vpn_data },
+ ["float"] = { nm_opt="float", func=handle_yes, tbl=g_vpn_data },
["fragment"] = { nm_opt="fragment-size", func=handle_generic, tbl=g_vpn_data },
+ ["http-proxy"] = { nm_opt={"proxy-type", "proxy-server", "proxy-port"}, func=handle_proxy, tbl=g_vpn_data },
+ ["http-proxy-retry"] = { nm_opt="proxy-retry", func=handle_yes, tbl=g_vpn_data },
["ifconfig"] = { nm_opt={"local-ip", "remote-ip"}, func=handle_ifconfig, tbl=g_vpn_data },
+ ["keepalive"] = { nm_opt={"ping", "ping-restart"}, func=handle_keepalive, tbl=g_vpn_data },
["key"] = { nm_opt="key", func=handle_path, tbl=g_vpn_data },
+ ["keysize"] = { nm_opt="keysize", func=handle_generic, tbl=g_vpn_data },
+ ["max-routes"] = { nm_opt="max-routes", func=handle_number, tbl=g_vpn_data },
["mssfix"] = { nm_opt="mssfix", func=handle_yes, tbl=g_vpn_data },
+ ["ns-cert-type"] = { nm_opt="ns-cert-type", func=handle_remote_cert_tls, tbl=g_vpn_data },
["ping"] = { nm_opt="ping", func=handle_number, tbl=g_vpn_data },
["ping-exit"] = { nm_opt="ping-exit", func=handle_number, tbl=g_vpn_data },
["ping-restart"] = { nm_opt="ping-restart", func=handle_number, tbl=g_vpn_data },
["pkcs12"] = { nm_opt="client", func=handle_path, tbl=g_vpn_data },
["port"] = { nm_opt="port", func=handle_port, tbl=g_vpn_data },
- ["rport"] = { nm_opt="port", func=handle_port, tbl=g_vpn_data },
["proto"] = { nm_opt="proto-tcp", func=handle_proto, tbl=g_vpn_data },
- ["http-proxy"] = { nm_opt={"proxy-type", "proxy-server", "proxy-port"}, func=handle_proxy, tbl=g_vpn_data },
- ["http-proxy-retry"] = { nm_opt="proxy-retry", func=handle_yes, tbl=g_vpn_data },
- ["socks-proxy"] = { nm_opt={"proxy-type", "proxy-server", "proxy-port"}, func=handle_proxy, tbl=g_vpn_data },
- ["socks-proxy-retry"] = { nm_opt="proxy-retry", func=handle_yes, tbl=g_vpn_data },
["remote"] = { nm_opt="remote", func=handle_remote, tbl=g_vpn_data },
+ ["remote-cert-tls"] = { nm_opt="remote-cert-tls", func=handle_remote_cert_tls, tbl=g_vpn_data },
["remote-random"] = { nm_opt="remote-random", func=handle_yes, tbl=g_vpn_data },
["reneg-sec"] = { nm_opt="reneg-seconds", func=handle_generic, tbl=g_vpn_data },
+ ["route"] = { nm_opt="routes", func=handle_routes, tbl=g_ip4_data },
+ ["rport"] = { nm_opt="port", func=handle_port, tbl=g_vpn_data },
["secret"] = { nm_opt={"static-key", "static-key-direction"}, func=handle_secret, tbl=g_vpn_data },
+ ["socks-proxy"] = { nm_opt={"proxy-type", "proxy-server", "proxy-port"}, func=handle_proxy, tbl=g_vpn_data },
+ ["socks-proxy-retry"] = { nm_opt="proxy-retry", func=handle_yes, tbl=g_vpn_data },
["tls-auth"] = { nm_opt={"ta", "ta-dir"}, func=handle_secret, tbl=g_vpn_data },
+ ["tls-cipher"] = { nm_opt="tls-cipher", func=handle_generic_unquote, tbl=g_vpn_data },
["tls-client"] = { nm_opt="client", func=set_bool, tbl={} },
["tls-remote"] = { nm_opt="tls-remote", func=handle_generic_unquote, tbl=g_vpn_data },
- ["remote-cert-tls"] = { nm_opt="remote-cert-tls", func=handle_remote_cert_tls, tbl=g_vpn_data },
- ["ns-cert-type"] = { nm_opt="ns-cert-type", func=handle_remote_cert_tls, tbl=g_vpn_data },
- ["tun-mtu"] = { nm_opt="tunnel-mtu", func=handle_generic, tbl=g_vpn_data },
["tun-ipv6"] = { nm_opt="tun-ipv6", func=handle_yes, tbl=g_vpn_data },
- ["route"] = { nm_opt="routes", func=handle_routes, tbl=g_ip4_data },
- ["max-routes"] = { nm_opt="max-routes", func=handle_number, tbl=g_vpn_data },
- ["tls-cipher"] = { nm_opt="tls-cipher", func=handle_generic_unquote, tbl=g_vpn_data },
+ ["tun-mtu"] = { nm_opt="tunnel-mtu", func=handle_generic, tbl=g_vpn_data },
["verify-x509-name"] = { nm_opt="verify-x509-name", func=handle_verify_x509_name,tbl=g_vpn_data },
}