← Back to branch summary

~shakaran/ubuntu/quantal/connman/bug-pattern-update

« back to all changes in this revision

Viewing changes to scripts/dhclient-script.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel
  • Date: 2010-02-12 10:08:03 UTC
  • mfrom: (1.1.8 upstream) (0.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100212100803-s8iaj8g1dmgwm2uz
Tags: 0.48+dfsg-2
http://bugs.debian.org/546616
* Ubuntu/Debian sync upload
* Re-add missing changes from 0.45+dfsg that made it only in Ubuntu:
  - ship development parts in a connman-dev package (Closes: 546616)
    - add debian/connman-dev.install
    - update debian/control
* Update long descriptions for connman and connman-dev
  - update debian/control
* Add missing Depends on libglib2.0-dev, libdbus-1-dev for connman-dev
  - update debian/control
* Don't run bootstrap twice during build.
  - update debian/rules
* Remove old configure option: enable-ppp, with-pppd, enable-novatel,
  enable-huawei and enable-modemmgr are no longer recognized.
  - update debian/rules

Show diffs side-by-side

added added

removed removed

Lines of Context:
scripts/dhclient-script.c
29
29
 
30
30
#include <dbus/dbus.h>
31
31
 
32
 
#define DHCLIENT_INTF "org.isc.dhclient"
33
 
#define DHCLIENT_PATH "/org/isc/dhclient"
34
 
 
35
32
extern char **environ;
36
33
 
37
34
static void append(DBusMessageIter *dict, const char *pattern)
63
60
        DBusMessage *msg;
64
61
        DBusMessageIter iter, dict;
65
62
        dbus_uint32_t pid;
66
 
        char **envp, *busname, *reason, *interface;
 
63
        char **envp, *busname, *busintf, *buspath, *reason, *interface;
67
64
 
68
65
        busname = getenv("BUSNAME");
 
66
        busintf = getenv("BUSINTF");
 
67
        buspath = getenv("BUSPATH");
69
68
 
70
69
        pid = atoi(getenv("pid"));
71
70
        reason = getenv("reason");
83
82
                return 0;
84
83
        }
85
84
 
86
 
        msg = dbus_message_new_method_call(busname, DHCLIENT_PATH,
87
 
                                                DHCLIENT_INTF, "notify");
 
85
        msg = dbus_message_new_method_call(busname, buspath,
 
86
                                                        busintf, "Notify");
88
87
        if (msg == NULL) {
89
88
                dbus_connection_unref(conn);
90
89
                fprintf(stderr, "Failed to allocate method call\n");