chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b1b532f
)
libsystemd-dhcp: don't assert on client_stop()
author
Tom Gundersen
<teg@jklm.no>
Fri, 3 Jan 2014 00:25:18 +0000
(
01:25
+0100)
committer
Tom Gundersen
<teg@jklm.no>
Fri, 3 Jan 2014 00:42:26 +0000
(
01:42
+0100)
We need to be able to stop the dhcp client at any time, and the function appears to be written to handle this.
src/libsystemd-dhcp/dhcp-client.c
patch
|
blob
|
history
diff --git
a/src/libsystemd-dhcp/dhcp-client.c
b/src/libsystemd-dhcp/dhcp-client.c
index b9492a5a680d349781f2c3e4b03b2dfd850e6830..f6a621102219c395460de96177b05fc9bee4e3ad 100644
(file)
--- a/
src/libsystemd-dhcp/dhcp-client.c
+++ b/
src/libsystemd-dhcp/dhcp-client.c
@@
-260,8
+260,6
@@
static int client_notify(sd_dhcp_client *client, int event)
static int client_stop(sd_dhcp_client *client, int error)
{
assert_return(client, -EINVAL);
- assert_return(client->state != DHCP_STATE_INIT &&
- client->state != DHCP_STATE_INIT_REBOOT, -EALREADY);
client->receive_message =
sd_event_source_unref(client->receive_message);