Handle proxy setting in NetworkManager, ignore unnecessary 'authtype'

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

diff --git a/auth-dlg-settings.h b/auth-dlg-settings.h
index f0e43df..1e9105c 100644 (file)
--- a/auth-dlg-settings.h
+++ b/auth-dlg-settings.h
@@ -31,15 +31,11 @@
 #define NM_OPENCONNECT_KEY_GATEWAY "gateway"
 #define NM_OPENCONNECT_KEY_COOKIE "cookie"
 #define NM_OPENCONNECT_KEY_GWCERT "gwcert"
-#define NM_OPENCONNECT_KEY_AUTHTYPE "authtype"
 #define NM_OPENCONNECT_KEY_USERCERT "usercert"
 #define NM_OPENCONNECT_KEY_CACERT "cacert"
 #define NM_OPENCONNECT_KEY_PRIVKEY "userkey"
 #define NM_OPENCONNECT_KEY_USERNAME "username"
 #define NM_OPENCONNECT_KEY_XMLCONFIG "xmlconfig"
 
-#define NM_OPENCONNECT_AUTHTYPE_CERT "cert"
-#define NM_OPENCONNECT_AUTHTYPE_CERT_TPM "cert-tpm"
-#define NM_OPENCONNECT_AUTHTYPE_PASSWORD "password"
 
 #endif /* __OPENCONNECT_AUTH_DLG_SETTINGS_H */

diff --git a/nm-auth-dialog.c b/nm-auth-dialog.c
index f118aa5..5190c4d 100644 (file)
--- a/nm-auth-dialog.c
+++ b/nm-auth-dialog.c
@@ -884,7 +884,7 @@ static int parse_xmlconfig(char *xmlconfig)
 
 static int get_config(char *vpn_uuid, struct openconnect_info *vpninfo)
 {
-       char *authtype;
+       char *proxy;
        char *xmlconfig;
        char *hostname;
        char *group;
@@ -950,37 +950,18 @@ if (0) {
 
        vpninfo->cafile = get_gconf_setting(gcl, config_path, NM_OPENCONNECT_KEY_CACERT);
 
-       authtype = get_gconf_setting(gcl, config_path, NM_OPENCONNECT_KEY_AUTHTYPE);
-       if (!authtype) {
-               fprintf(stderr, "No authentication type configured\n");
-               return -EINVAL;
-       }
 
-       if (!strcmp(authtype, NM_OPENCONNECT_AUTHTYPE_PASSWORD)) {
-               vpninfo->username = get_gconf_setting(gcl, config_path,
-                                                     NM_OPENCONNECT_KEY_USERNAME);
-               return 0;
-       }
-       if (!strcmp(authtype, NM_OPENCONNECT_AUTHTYPE_CERT_TPM))
-               vpninfo->cert_type = CERT_TYPE_TPM;
-       else if (strcmp(authtype, NM_OPENCONNECT_AUTHTYPE_CERT)) {
-               fprintf(stderr, "Unknown authentication type '%s'\n", authtype);
+       proxy = get_gconf_setting(gcl, config_path, "proxy");
+       if (proxy && proxy[0] && set_http_proxy(vpninfo, proxy))
                return -EINVAL;
-       }
 
-       /* It's a certificate */
        vpninfo->cert = get_gconf_setting(gcl, config_path, NM_OPENCONNECT_KEY_USERCERT);
-       if (!vpninfo->cert) {
-               fprintf(stderr, "No user certificate configured\n");
-               return -EINVAL;
-       }
-
        vpninfo->sslkey = get_gconf_setting(gcl, config_path, NM_OPENCONNECT_KEY_PRIVKEY);
        if (!vpninfo->sslkey)
                vpninfo->sslkey = vpninfo->cert;
 
        pem_passphrase_fsid = get_gconf_setting(gcl, config_path, "pem_passphrase_fsid");
-       if (pem_passphrase_fsid && !strcmp(pem_passphrase_fsid, "yes"))
+       if (pem_passphrase_fsid && vpninfo->sslkey && !strcmp(pem_passphrase_fsid, "yes"))
                passphrase_from_fsid(vpninfo);
        g_free(pem_passphrase_fsid);