Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/dhcpcd/dist/src Remove mistakenly commited debug.



details:   https://anonhg.NetBSD.org/src/rev/9efd5fec45f6
branches:  trunk
changeset: 826949:9efd5fec45f6
user:      roy <roy%NetBSD.org@localhost>
date:      Sat Oct 07 14:14:40 2017 +0000

description:
Remove mistakenly commited debug.

diffstat:

 external/bsd/dhcpcd/dist/src/dhcp.c |  11 +----------
 1 files changed, 1 insertions(+), 10 deletions(-)

diffs (31 lines):

diff -r 255d843e7f56 -r 9efd5fec45f6 external/bsd/dhcpcd/dist/src/dhcp.c
--- a/external/bsd/dhcpcd/dist/src/dhcp.c       Sat Oct 07 14:11:11 2017 +0000
+++ b/external/bsd/dhcpcd/dist/src/dhcp.c       Sat Oct 07 14:14:40 2017 +0000
@@ -1487,7 +1487,6 @@
        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 @@
 #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;
        }



Home | Main Index | Thread Index | Old Index