diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:57:26 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-08-03 17:57:26 +0200 |
| commit | 6934f402cded89a988e8d7f93bf0b7b4eb8f17f3 (patch) | |
| tree | 0decd0bdddc5a9be1ea76ce38c756ec85e42ab94 /src/libsystemd-network/sd-dhcp-server.c | |
| parent | 5ef9b2203e027da168b18d92045462422895565b (diff) | |
| parent | 38a03f06a7393d2721c23f23f0589d2f6d0904af (diff) | |
Merge pull request #843 from poettering/clock-boottime
sd-event: make sure sd_event_now() cannot fail
Diffstat (limited to 'src/libsystemd-network/sd-dhcp-server.c')
| -rw-r--r-- | src/libsystemd-network/sd-dhcp-server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsystemd-network/sd-dhcp-server.c b/src/libsystemd-network/sd-dhcp-server.c index cc5e032344..d2cc3194b3 100644 --- a/src/libsystemd-network/sd-dhcp-server.c +++ b/src/libsystemd-network/sd-dhcp-server.c @@ -797,7 +797,7 @@ int dhcp_server_handle_message(sd_dhcp_server *server, DHCPMessage *message, clock_boottime_or_monotonic(), &time_now); if (r < 0) - time_now = now(clock_boottime_or_monotonic()); + return r; lease->expiration = req->lifetime * USEC_PER_SEC + time_now; r = server_send_ack(server, req, address); |