mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 07:15:44 +00:00
Code Issues Releases Wiki Activity

In supersede_lease, replace 'on' statements if new values are provided.

Browse Source
This commit is contained in:
Ted Lemon
1999-09-22 17:24:11 +00:00
parent fa098be8f9
commit a2e08b0a78
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
common/memory.c
View File

@@ -22,7 +22,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: memory.c,v 1.59 1999/09/16 05:12:33 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; "$Id: memory.c,v 1.60 1999/09/22 17:24:11 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -756,6 +756,31 @@ int supersede_lease (comp, lease, commit)
comp -> hardware_addr = lease -> hardware_addr; comp -> hardware_addr = lease -> hardware_addr;
comp -> flags = ((lease -> flags & ~PERSISTENT_FLAGS) | comp -> flags = ((lease -> flags & ~PERSISTENT_FLAGS) |
(comp -> flags & ~EPHEMERAL_FLAGS)); (comp -> flags & ~EPHEMERAL_FLAGS));
if (lease -> on_expiry) {
if (comp -> on_expiry)
executable_statement_dereference (&comp -> on_expiry,
"supersede_lease");
executable_statement_reference (&comp -> on_expiry,
lease -> on_expiry,
"supersede_lease");
}
if (lease -> on_commit) {
if (comp -> on_commit)
executable_statement_dereference (&comp -> on_commit,
"supersede_lease");
executable_statement_reference (&comp -> on_commit,
lease -> on_commit,
"supersede_lease");
}
if (lease -> on_release) {
if (comp -> on_release)
executable_statement_dereference (&comp -> on_release,
"supersede_lease");
executable_statement_reference (&comp -> on_release,
lease -> on_release,
"supersede_lease");
}
/* Record the lease in the uid hash if necessary. */ /* Record the lease in the uid hash if necessary. */
if (enter_uid && lease -> uid) { if (enter_uid && lease -> uid) {