diff options
| author | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:14 +0100 |
| commit | b436a68a20ff3114ded32a7a3d70cdd4954039f9 (patch) | |
| tree | 3e7d6971c35b47b6e67604f54d434d909be0f228 /src/dhcp-manager | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Imported Upstream version 0.9.2.0 upstream/0.9.2.0
Diffstat (limited to 'src/dhcp-manager')
| -rw-r--r-- | src/dhcp-manager/Makefile.in | 2 | ||||
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-client.c | 2 | ||||
| -rw-r--r-- | src/dhcp-manager/nm-dhcp-dhclient.c | 17 | ||||
| -rw-r--r-- | src/dhcp-manager/tests/Makefile.in | 2 |
4 files changed, 20 insertions, 3 deletions
diff --git a/src/dhcp-manager/Makefile.in b/src/dhcp-manager/Makefile.in index d373f7e9..2d90f043 100644 --- a/src/dhcp-manager/Makefile.in +++ b/src/dhcp-manager/Makefile.in @@ -200,6 +200,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ diff --git a/src/dhcp-manager/nm-dhcp-client.c b/src/dhcp-manager/nm-dhcp-client.c index f10f3de9..16c6dd77 100644 --- a/src/dhcp-manager/nm-dhcp-client.c +++ b/src/dhcp-manager/nm-dhcp-client.c @@ -262,7 +262,7 @@ daemon_watch_cb (GPid pid, gint status, gpointer user_data) priv->iface, pid, WIFEXITED (status) ? WEXITSTATUS (status) : -1); } else { - nm_log_info (LOGD_DHCP6, "(%s): DHCPv4 client pid %d exited with status %d", + nm_log_info (LOGD_DHCP4, "(%s): DHCPv4 client pid %d exited with status %d", priv->iface, pid, WIFEXITED (status) ? WEXITSTATUS (status) : -1); } diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index 88136a90..09321396 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -418,8 +418,8 @@ dhclient_start (NMDHCPClient *client, GPtrArray *argv = NULL; GPid pid = -1; GError *error = NULL; - const char *iface, *uuid; - char *binary_name, *cmd_str, *pid_file = NULL; + const char *iface, *uuid, *system_bus_address; + char *binary_name, *cmd_str, *pid_file = NULL, *system_bus_address_env = NULL; gboolean ipv6; guint log_domain; @@ -503,6 +503,18 @@ dhclient_start (NMDHCPClient *client, g_ptr_array_add (argv, (gpointer) priv->conf_file); } + /* Usually the system bus address is well-known; but if it's supposed + * to be something else, we need to push it to dhclient, since dhclient + * sanitizes the environment it gives the action scripts. + */ + system_bus_address = getenv ("DBUS_SYSTEM_BUS_ADDRESS"); + if (system_bus_address) { + system_bus_address_env = g_strdup_printf ("DBUS_SYSTEM_BUS_ADDRESS=%s", system_bus_address); + g_ptr_array_add (argv, (gpointer) "-e"); + g_ptr_array_add (argv, (gpointer) system_bus_address_env); + } + + g_ptr_array_add (argv, (gpointer) iface); g_ptr_array_add (argv, NULL); @@ -521,6 +533,7 @@ dhclient_start (NMDHCPClient *client, } g_ptr_array_free (argv, TRUE); + g_free (system_bus_address_env); return pid; } diff --git a/src/dhcp-manager/tests/Makefile.in b/src/dhcp-manager/tests/Makefile.in index 8a3c2e97..5c4c23a5 100644 --- a/src/dhcp-manager/tests/Makefile.in +++ b/src/dhcp-manager/tests/Makefile.in @@ -150,6 +150,8 @@ GNUTLS_CFLAGS = @GNUTLS_CFLAGS@ GNUTLS_LIBS = @GNUTLS_LIBS@ GREP = @GREP@ GTKDOC_CHECK = @GTKDOC_CHECK@ +GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ +GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ GUDEV_CFLAGS = @GUDEV_CFLAGS@ |