← Back to branch summary

~ubuntu-branches/ubuntu/precise/network-manager/precise

« back to all changes in this revision

Viewing changes to cli/src/settings.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-09 16:45:41 UTC
  • mfrom: (1.1.53)
  • Revision ID: package-import@ubuntu.com-20120209164541-4h90zknlsfdb7x35
Tags: 0.9.2.0+git201202091925.c721477-0ubuntu1
* upstream snapshot 2012-02-09 19:25:59 (GMT)
  + c721477d11d4fe144111d6d2eec8f93f2e9186c9
* debian/patches/avoid-periodic-disk-wakeups.patch: refreshed.
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/libnm-glib4.symbols: add symbols:
  + nm_active_connection_get_master@Base
  + nm_client_new_async@Base
  + nm_client_new_finish@Base
  + nm_remote_settings_new_async@Base
  + nm_remote_settings_new_finish@Base
  + nm_device_get_state_reason@Base
* debian/libnm-util2.symbols: add symbols:
  + nm_setting_802_1x_get_pac_file@Base
  + nm_setting_infiniband_get_transport_mode@Base

Show diffs side-by-side

added added

removed removed

Lines of Context:
cli/src/settings.c
14
14
 * with this program; if not, write to the Free Software Foundation, Inc.,
15
15
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
16
16
 *
17
 
 * (C) Copyright 2010 - 2011 Red Hat, Inc.
 
17
 * (C) Copyright 2010 - 2012 Red Hat, Inc.
18
18
 */
19
19
 
20
20
#include "config.h"
90
90
        SETTING_FIELD (NM_SETTING_802_1X_EAP, 10),                          /* 1 */
91
91
        SETTING_FIELD (NM_SETTING_802_1X_IDENTITY, 15),                     /* 2 */
92
92
        SETTING_FIELD (NM_SETTING_802_1X_ANONYMOUS_IDENTITY, 15),           /* 3 */
93
 
        SETTING_FIELD (NM_SETTING_802_1X_CA_CERT, 10),                      /* 4 */
94
 
        SETTING_FIELD (NM_SETTING_802_1X_CA_PATH, 10),                      /* 5 */
95
 
        SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH, 10),                /* 6 */
96
 
        SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, 10),           /* 7 */
97
 
        SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT, 10),                  /* 8 */
98
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER, 10),               /* 9 */
99
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL, 10),             /* 10 */
100
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, 10),     /* 11 */
101
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH, 10),                  /* 12 */
102
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP, 10),               /* 13 */
103
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT, 20),               /* 14 */
104
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH, 20),               /* 15 */
105
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, 10),         /* 16 */
106
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, 10),    /* 17 */
107
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, 20),           /* 18 */
108
 
        SETTING_FIELD (NM_SETTING_802_1X_PASSWORD, 10),                     /* 19 */
109
 
        SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY, 15),                  /* 20 */
110
 
        SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, 20),         /* 21 */
111
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, 20),           /* 22 */
112
 
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, 20),  /* 23 */
113
 
        SETTING_FIELD (NM_SETTING_802_1X_PIN, 8),                           /* 24 */
114
 
        SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS, 17),              /* 25 */
 
93
        SETTING_FIELD (NM_SETTING_802_1X_PAC_FILE, 15),                     /* 4 */
 
94
        SETTING_FIELD (NM_SETTING_802_1X_CA_CERT, 10),                      /* 5 */
 
95
        SETTING_FIELD (NM_SETTING_802_1X_CA_PATH, 10),                      /* 6 */
 
96
        SETTING_FIELD (NM_SETTING_802_1X_SUBJECT_MATCH, 10),                /* 7 */
 
97
        SETTING_FIELD (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, 10),           /* 8 */
 
98
        SETTING_FIELD (NM_SETTING_802_1X_CLIENT_CERT, 10),                  /* 9 */
 
99
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPVER, 10),               /* 10 */
 
100
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_PEAPLABEL, 10),             /* 11 */
 
101
        SETTING_FIELD (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, 10),     /* 12 */
 
102
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTH, 10),                  /* 13 */
 
103
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_AUTHEAP, 10),               /* 14 */
 
104
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_CERT, 20),               /* 15 */
 
105
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CA_PATH, 20),               /* 16 */
 
106
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, 10),         /* 17 */
 
107
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, 10),    /* 18 */
 
108
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, 20),           /* 19 */
 
109
        SETTING_FIELD (NM_SETTING_802_1X_PASSWORD, 10),                     /* 20 */
 
110
        SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY, 15),                  /* 21 */
 
111
        SETTING_FIELD (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, 20),         /* 22 */
 
112
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, 20),           /* 23 */
 
113
        SETTING_FIELD (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, 20),  /* 24 */
 
114
        SETTING_FIELD (NM_SETTING_802_1X_PIN, 8),                           /* 25 */
 
115
        SETTING_FIELD (NM_SETTING_802_1X_SYSTEM_CA_CERTS, 17),              /* 26 */
115
116
        {NULL, NULL, 0, NULL, 0}
116
117
};
117
118
#define NMC_FIELDS_SETTING_802_1X_ALL     "name"","\
118
119
                                          NM_SETTING_802_1X_EAP","\
119
120
                                          NM_SETTING_802_1X_IDENTITY","\
120
121
                                          NM_SETTING_802_1X_ANONYMOUS_IDENTITY","\
 
122
                                          NM_SETTING_802_1X_PAC_FILE","\
121
123
                                          NM_SETTING_802_1X_CA_CERT","\
122
124
                                          NM_SETTING_802_1X_CA_PATH","\
123
125
                                          NM_SETTING_802_1X_SUBJECT_MATCH","\
445
447
        SETTING_FIELD ("name",  12),                                       /* 0 */
446
448
        SETTING_FIELD (NM_SETTING_INFINIBAND_MAC_ADDRESS, 61),             /* 1 */
447
449
        SETTING_FIELD (NM_SETTING_INFINIBAND_MTU, 6),                      /* 2 */
 
450
        SETTING_FIELD (NM_SETTING_INFINIBAND_TRANSPORT_MODE, 12),          /* 3 */
448
451
        {NULL, NULL, 0, NULL, 0}
449
452
};
450
453
#define NMC_FIELDS_SETTING_INFINIBAND_ALL     "name"","\
451
454
                                              NM_SETTING_INFINIBAND_MAC_ADDRESS","\
452
 
                                              NM_SETTING_INFINIBAND_MTU
 
455
                                              NM_SETTING_INFINIBAND_MTU","\
 
456
                                              NM_SETTING_INFINIBAND_TRANSPORT_MODE
453
457
#define NMC_FIELDS_SETTING_INFINIBAND_COMMON  NMC_FIELDS_SETTING_INFINIBAND_ALL
454
458
 
455
459
 
737
741
        nmc->allowed_fields[1].value = eap_str->str;
738
742
        nmc->allowed_fields[2].value = nm_setting_802_1x_get_identity (s_8021X);
739
743
        nmc->allowed_fields[3].value = nm_setting_802_1x_get_anonymous_identity (s_8021X);
740
 
        nmc->allowed_fields[4].value = ca_cert_str;
741
 
        nmc->allowed_fields[5].value = nm_setting_802_1x_get_ca_path (s_8021X);
742
 
        nmc->allowed_fields[6].value = nm_setting_802_1x_get_subject_match (s_8021X);
743
 
        nmc->allowed_fields[7].value = alt_sub_match->str;
744
 
        nmc->allowed_fields[8].value = client_cert_str;
745
 
        nmc->allowed_fields[9].value = nm_setting_802_1x_get_phase1_peapver (s_8021X);
746
 
        nmc->allowed_fields[10].value = nm_setting_802_1x_get_phase1_peaplabel (s_8021X);
747
 
        nmc->allowed_fields[11].value = nm_setting_802_1x_get_phase1_fast_provisioning (s_8021X);
748
 
        nmc->allowed_fields[12].value = nm_setting_802_1x_get_phase2_auth (s_8021X);
749
 
        nmc->allowed_fields[13].value = nm_setting_802_1x_get_phase2_autheap (s_8021X);
750
 
        nmc->allowed_fields[14].value = phase2_ca_cert_str;
751
 
        nmc->allowed_fields[15].value = nm_setting_802_1x_get_phase2_ca_path (s_8021X);
752
 
        nmc->allowed_fields[16].value = nm_setting_802_1x_get_phase2_subject_match (s_8021X);
753
 
        nmc->allowed_fields[17].value = phase2_alt_sub_match->str;
754
 
        nmc->allowed_fields[18].value = phase2_client_cert_str;
755
 
        nmc->allowed_fields[19].value = nm_setting_802_1x_get_password (s_8021X);
756
 
        nmc->allowed_fields[20].value = private_key_str;
757
 
        nmc->allowed_fields[21].value = nm_setting_802_1x_get_private_key_password (s_8021X);
758
 
        nmc->allowed_fields[22].value = phase2_private_key_str;
759
 
        nmc->allowed_fields[23].value = nm_setting_802_1x_get_phase2_private_key_password (s_8021X);
760
 
        nmc->allowed_fields[24].value = nm_setting_802_1x_get_pin (s_8021X);
761
 
        nmc->allowed_fields[25].value = nm_setting_802_1x_get_system_ca_certs (s_8021X) ? _("yes") : _("no");
 
744
        nmc->allowed_fields[4].value = nm_setting_802_1x_get_pac_file (s_8021X);
 
745
        nmc->allowed_fields[5].value = ca_cert_str;
 
746
        nmc->allowed_fields[6].value = nm_setting_802_1x_get_ca_path (s_8021X);
 
747
        nmc->allowed_fields[7].value = nm_setting_802_1x_get_subject_match (s_8021X);
 
748
        nmc->allowed_fields[8].value = alt_sub_match->str;
 
749
        nmc->allowed_fields[9].value = client_cert_str;
 
750
        nmc->allowed_fields[10].value = nm_setting_802_1x_get_phase1_peapver (s_8021X);
 
751
        nmc->allowed_fields[11].value = nm_setting_802_1x_get_phase1_peaplabel (s_8021X);
 
752
        nmc->allowed_fields[12].value = nm_setting_802_1x_get_phase1_fast_provisioning (s_8021X);
 
753
        nmc->allowed_fields[13].value = nm_setting_802_1x_get_phase2_auth (s_8021X);
 
754
        nmc->allowed_fields[14].value = nm_setting_802_1x_get_phase2_autheap (s_8021X);
 
755
        nmc->allowed_fields[15].value = phase2_ca_cert_str;
 
756
        nmc->allowed_fields[16].value = nm_setting_802_1x_get_phase2_ca_path (s_8021X);
 
757
        nmc->allowed_fields[17].value = nm_setting_802_1x_get_phase2_subject_match (s_8021X);
 
758
        nmc->allowed_fields[18].value = phase2_alt_sub_match->str;
 
759
        nmc->allowed_fields[19].value = phase2_client_cert_str;
 
760
        nmc->allowed_fields[20].value = nm_setting_802_1x_get_password (s_8021X);
 
761
        nmc->allowed_fields[21].value = private_key_str;
 
762
        nmc->allowed_fields[22].value = nm_setting_802_1x_get_private_key_password (s_8021X);
 
763
        nmc->allowed_fields[23].value = phase2_private_key_str;
 
764
        nmc->allowed_fields[24].value = nm_setting_802_1x_get_phase2_private_key_password (s_8021X);
 
765
        nmc->allowed_fields[25].value = nm_setting_802_1x_get_pin (s_8021X);
 
766
        nmc->allowed_fields[26].value = nm_setting_802_1x_get_system_ca_certs (s_8021X) ? _("yes") : _("no");
762
767
 
763
768
        nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
764
769
        print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */
1543
1548
        nmc->allowed_fields[0].value = NM_SETTING_INFINIBAND_SETTING_NAME;
1544
1549
        nmc->allowed_fields[1].value = mac_str;
1545
1550
        nmc->allowed_fields[2].value = strcmp (mtu_str, "0") ? mtu_str : _("auto");
 
1551
        nmc->allowed_fields[3].value = nm_setting_infiniband_get_transport_mode (s_infiniband);
1546
1552
 
1547
1553
        nmc->print_fields.flags = multiline_flag | mode_flag | escape_flag | NMC_PF_FLAG_SECTION_PREFIX;
1548
1554
        print_fields (nmc->print_fields, nmc->allowed_fields); /* Print values */