From: Ted Lemon Date: Tue, 5 Dec 2000 07:32:26 +0000 (+0000) Subject: Don't blow away bindings and such when releasing or abandoning leases. X-Git-Tag: V3-BETA-2-PATCH-12~93 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38d717583a84272c7e52b34cee659a0d3bfef675;p=thirdparty%2Fdhcp.git Don't blow away bindings and such when releasing or abandoning leases. --- diff --git a/server/mdb.c b/server/mdb.c index 4d095307b..0b0b08b35 100644 --- a/server/mdb.c +++ b/server/mdb.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: mdb.c,v 1.44 2000/11/28 23:27:21 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: mdb.c,v 1.45 2000/12/05 07:32:26 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -1263,6 +1263,7 @@ void abandon_lease (lease, message) if (!lease_copy (<, lease, MDL)) return; +#if 0 if (lt -> on_expiry) executable_statement_dereference (&lease -> on_expiry, MDL); if (lt -> on_release) @@ -1273,6 +1274,8 @@ void abandon_lease (lease, message) /* Blow away any bindings. */ if (lt -> scope) binding_scope_dereference (< -> scope, MDL); +#endif + lt -> ends = cur_time; /* XXX */ lt -> next_binding_state = FTS_ABANDONED; @@ -1301,6 +1304,7 @@ void dissociate_lease (lease) if (!lease_copy (<, lease, MDL)) return; +#if 0 if (lt -> on_expiry) executable_statement_dereference (&lease -> on_expiry, MDL); if (lt -> on_release) @@ -1311,6 +1315,7 @@ void dissociate_lease (lease) /* Blow away any bindings. */ if (lt -> scope) binding_scope_dereference (< -> scope, MDL); +#endif #if defined (FAILOVER_PROTOCOL) if (lease -> pool && lease -> pool -> failover_peer) {