diff options
| author |   krw <krw@openbsd.org> | 2015-12-11 14:09:48 +0000 |
|---|---|---|
| committer | krw <krw@openbsd.org> | 2015-12-11 14:09:48 +0000 |
| commit | 9fbb22a776c608ff11a9a5268c1424627d65f7af (patch) | |
| tree | 108e82c062087cc775ed3f6596bbfd1d1851ba00 /usr.sbin/dhcpd/parse.c | |
| parent | it's not necessary to use a tree to track requests if kevent can do this. (diff) | |
| download | wireguard-openbsd-9fbb22a776c608ff11a9a5268c1424627d65f7af.tar.xz wireguard-openbsd-9fbb22a776c608ff11a9a5268c1424627d65f7af.zip | |
Actually use default-lease-time, max-lease-time, bootp-lease-length
specified in dhcpd.conf. Broken in -r1.18.
Problem noted by Arne on bugs@, identical fix independently developed
by Serguey Parkhomovsky.
Diffstat (limited to 'usr.sbin/dhcpd/parse.c')
| -rw-r--r-- | usr.sbin/dhcpd/parse.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/dhcpd/parse.c b/usr.sbin/dhcpd/parse.c index 12c2d184e60..c93620fd38d 100644 --- a/usr.sbin/dhcpd/parse.c +++ b/usr.sbin/dhcpd/parse.c @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.c,v 1.18 2015/05/18 17:51:21 krw Exp $ */ +/* $OpenBSD: parse.c,v 1.19 2015/12/11 14:09:48 krw Exp $ */ /* Common parser code for dhcpd and dhclient. */ @@ -268,6 +268,8 @@ parse_lease_time(FILE *cfile, time_t *timep) return; } + *timep = value; + parse_semi(cfile); } |