Module Name: src
Committed By: roy
Date: Sat Oct 7 14:14:40 UTC 2017
Modified Files:
src/external/bsd/dhcpcd/dist/src: dhcp.c
Log Message:
Remove mistakenly commited debug.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/src/dhcp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/src/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/src/dhcp.c:1.4 src/external/bsd/dhcpcd/dist/src/dhcp.c:1.5
--- src/external/bsd/dhcpcd/dist/src/dhcp.c:1.4 Sat Oct 7 14:11:07 2017
+++ src/external/bsd/dhcpcd/dist/src/dhcp.c Sat Oct 7 14:14:40 2017
@@ -1487,7 +1487,6 @@ get_lease(struct interface *ifp,
if (get_option_uint32(ctx, &lease->renewaltime,
bootp, len, DHO_RENEWALTIME) != 0)
lease->renewaltime = 0;
- lease->renewaltime = 30;
if (get_option_uint32(ctx, &lease->rebindtime,
bootp, len, DHO_REBINDTIME) != 0)
lease->rebindtime = 0;
@@ -2750,18 +2749,10 @@ dhcp_handledhcp(struct interface *ifp, s
#endif
if (state->xid != ntohl(bootp->xid)) {
- if (state->state != DHS_BOUND && state->state != DHS_NONE) {
+ if (state->state != DHS_BOUND && state->state != DHS_NONE)
logdebugx("%s: wrong xid 0x%x (expecting 0x%x) from %s",
ifp->name, ntohl(bootp->xid), state->xid,
inet_ntoa(*from));
- char old[sizeof(state->leasefile)];
-
- memcpy(old, state->leasefile, sizeof(old));
- snprintf(state->leasefile, sizeof(state->leasefile), "/tmp/dhcpcd-wrongxid-0x%x.%d", state->xid, rand());
- if (write_lease(ifp, bootp, bootp_len) == -1)
- logerr(__func__);
- memcpy(state->leasefile, old, sizeof(old));
- }
dhcp_redirect_dhcp(ifp, bootp, bootp_len, from);
return;
}
