← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/network-manager/oneiric

« back to all changes in this revision

Viewing changes to src/dhcp-manager/nm-dhcp-manager.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-05-06 12:59:53 UTC
  • mfrom: (1.1.45 upstream)
  • Revision ID: james.westby@ubuntu.com-20110506125953-r4ka8fnwirdjd2g8
Tags: 0.8.4-0ubuntu1
* Upstream release 0.8.4.
* debian/source/format: migrate to package format 3.0 (quilt)
* debian/patches/99_printf_formatting_fixes.patch: dropped, applied upstream.
* debian/patches/git_disconn_secrets_reqs_b613a17.patch,
  debian/patches/git_wwan_state_detection_d0a1b23.patch, 
  debian/patches/git_wired_ap_scan_value_a262dc4.patch: dropped,
  applied upstream.
* debian/patches/lp120363_smartcard_pkcs11.patch: refreshed, for reordering
  the new symbols in the symbols list file.
* debian/patches/02-dbus_access_network_manager.patch: dropped, no longer
  required (hal is deprecated).
* debian/control: merge Debian changes and migrate to DH instead of CDBS:
  - bump debhelper Build-Depends to >= 8.
  - add Build-Depends on dh-autoreconf.
  - sync Build-Depends with Debian's; this drops automake1.9, cdbs, quilt,
    gnome-common, libgnome-keyring-dev, libgnomeui-dev, libpanel-applet2-dev,
    libglade2-dev, libgconf2-dev, iproute.
  - add new package network-manager-dbg for debug symbols.
  - bump Standards-Version to 3.9.2.
* debian/control: merge binary packages dependencies with Debian, important
  changes:
  - network-manager: Depends adds udev and isc-dhcp-client (>= 4.1.1-P1-4)
  - network-manager: Recommends: adds policykit-1
  - network-manager: Suggests: adds avahi-autoipd
* debian/compat: bump to compat level 8.
* debian/rules:
  - migrate to use dh instead of CDBS.
  - add override for dh_strip to correctly strip NM to the new
    package network-manager-dbg. 
  - cleanup more extra files left behind by the build.
* debian/libnm-glib-dev.install,
  debian/libnm-glib-vpn-dev.install: clean up and sync with Debian.
* debian/libnm-glib-dev.links: drop links to legacy names for .pc files,
  introduced in Karmic for a transition: they're not required anymore.
* debian/libnm-util-dev.install: sync with Debian.
* debian/network-manager.install:
  - don't ship .a and .la files.
  - explicitly install /usr/bin/nm-online.
  - install dispatchers from upstream in /etc/NetworkManager/dispatcher.d.
  - install extra udev rules from upstream.
* debian/network-manager.dirs: sync with Debian.
* debian/network-manager.docs: define additional upstream files to ship as
  documentation.
  - drop ifblacklist_migrate.sh and /usr/share/NetworkManager/gdb-cmd
* debian/network-manager.postrm: drop old code migrating /etc/dbus-1/event.d.
* debian/network-manager.postinst: drop code migrating /etc/dbus-1/event.d.
* debian/copyright: sync with Debian.
* debian/README.Debian: add information about using System-level settings and
  connections.
* debian/watch: because I can.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/dhcp-manager/nm-dhcp-manager.c
235
235
 
236
236
        client = get_client_for_pid (manager, (GPid) temp);
237
237
        if (client == NULL) {
238
 
                nm_log_warn (LOGD_DHCP, "(pid %zd) unhandled DHCP event for interface %s", temp, iface);
 
238
                nm_log_warn (LOGD_DHCP, "(pid %ld) unhandled DHCP event for interface %s", temp, iface);
239
239
                goto out;
240
240
        }
241
241
 
242
242
        if (strcmp (iface, nm_dhcp_client_get_iface (client))) {
243
 
                nm_log_warn (LOGD_DHCP, "(pid %zd) received DHCP event from unexpected interface '%s' (expected '%s')",
 
243
                nm_log_warn (LOGD_DHCP, "(pid %ld) received DHCP event from unexpected interface '%s' (expected '%s')",
244
244
                             temp, iface, nm_dhcp_client_get_iface (client));
245
245
                goto out;
246
246
        }
247
247
 
248
248
        reason = get_option (options, "reason");
249
249
        if (reason == NULL) {
250
 
                nm_log_warn (LOGD_DHCP, "(pid %zd) DHCP event didn't have a reason", temp);
 
250
                nm_log_warn (LOGD_DHCP, "(pid %ld) DHCP event didn't have a reason", temp);
251
251
                goto out;
252
252
        }
253
253