← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/nm-policy.c

  • Committer: Package Import Robot
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2012-02-16 16:01:07 UTC
  • mfrom: (1.1.54)
  • Revision ID: package-import@ubuntu.com-20120216160107-wdxf1ysnf4tl0iwd
Tags: 0.9.2.0+git201202161854.8572ecf-0ubuntu1
https://launchpad.net/bugs/869635
* upstream snapshot 2012-02-16 18:54:47 (GMT)
  + 8572ecfd7cc823097ff80de54ed6d7e17059c4fb
* debian/patches/nl3-default-ip6-route.patch: refreshed.
* debian/patches/manage-privacy-extensions.patch: allow NM to manage privacy
  extensions on a per-connection basis.
* debian/libnm-util2.symbols: add/update symbols:
  + nm_setting_ip6_config_get_enable_ip6_privacy@Base
  + nm_setting_802_1x_ck_format_get_type@Base
  + nm_setting_802_1x_ck_scheme_get_type@Base
  + nm_setting_bond_add_option@Base
  + nm_setting_bond_get_num_options@Base
  + nm_setting_bond_get_option@Base
  + nm_setting_bond_get_option_by_name@Base
  + nm_setting_bond_remove_option@Base
  + nm_setting_compare_flags_get_type@Base
  + nm_setting_diff_result_get_type@Base
  + nm_setting_gsm_network_band_get_type@Base
  + nm_setting_gsm_network_type_get_type@Base
  + nm_setting_hash_flags_get_type@Base
  + nm_setting_secret_flags_get_type@Base
  + nm_utils_security_type_get_type@Base
  + nm_wep_key_type_get_type@Base
* debian/libnm-glib4.symbols: add new symbols:
  + nm_client_permission_get_type@Base
  + nm_client_permission_result_get_type@Base
  + nm_secret_agent_get_secrets_flags_get_type@Base
  + nm_wimax_nsp_network_type_get_type@Base
* debian/patches/add_sendsigs_omissions.patch: move NM pid files for dhclient
  and dnsmasq (and also dhcpcd and named if they were used) to the
  /run/sendsigs.omit.d directory and with a slightly different name. This
  will let us skip over those processes as shutdown since they will be killed
  by NetworkManager when its upstart job stops. (LP: #869635)
* debian/rules: re-enable tests; run them inside dbus-test-runner.
* debian/control: Build-Depends on dbus-test-runner for tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nm-policy.c
534
534
 
535
535
                req = nm_device_get_act_request (dev);
536
536
                if (req && (req != best_req))
537
 
                        nm_act_request_set_default (req, FALSE);
 
537
                        nm_active_connection_set_default (NM_ACTIVE_CONNECTION (req), FALSE);
538
538
        }
539
539
 
540
540
        dns_mgr = nm_dns_manager_get (NULL);
545
545
         * if the connection is shared dnsmasq picks up the right stuff.
546
546
         */
547
547
        if (best_req)
548
 
                nm_act_request_set_default (best_req, TRUE);
 
548
                nm_active_connection_set_default (NM_ACTIVE_CONNECTION (best_req), TRUE);
549
549
 
550
550
        if (connection)
551
551
                s_con = nm_connection_get_setting_connection (connection);
661
661
 
662
662
                req = nm_device_get_act_request (dev);
663
663
                if (req && (req != best_req))
664
 
                        nm_act_request_set_default6 (req, FALSE);
 
664
                        nm_active_connection_set_default6 (NM_ACTIVE_CONNECTION (req), FALSE);
665
665
        }
666
666
 
667
667
        dns_mgr = nm_dns_manager_get (NULL);
672
672
         * if the connection is shared dnsmasq picks up the right stuff.
673
673
         */
674
674
        if (best_req)
675
 
                nm_act_request_set_default6 (best_req, TRUE);
 
675
                nm_active_connection_set_default6 (NM_ACTIVE_CONNECTION (best_req), TRUE);
676
676
 
677
677
        if (connection)
678
678
                s_con = nm_connection_get_setting_connection (connection);
832
832
                                                     NULL,
833
833
                                                     &error)) {
834
834
                        nm_log_info (LOGD_DEVICE, "Connection '%s' auto-activation failed: (%d) %s",
835
 
                                     nm_connection_get_id (best_connection), error->code, error->message);
 
835
                                     nm_connection_get_id (best_connection),
 
836
                                     error ? error->code : -1,
 
837
                                     error ? error->message : "(none)");
836
838
                        g_error_free (error);
837
839
                }
838
840
        }