diff options
| author | Ted Lemon <source@isc.org> | 2000-07-01 05:54:22 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-07-01 05:54:22 +0000 |
| commit | 34ca95e22a69a7be91133c06c7e03a794bd50c5d (patch) | |
| tree | 008f3684a5a5398e434b203c5157f1156a624ffd | |
| parent | c2536250bc18f12f8572b8ca3ebaafdcee6f027c (diff) | |
| download | isc-dhcp-3-BETA-1-PATCH-15.tar.gz | |
Fix test condition for class billing in supersede_leaseV3-BETA-1-PATCH-15
| -rw-r--r-- | common/memory.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/memory.c b/common/memory.c index ba16681c..cdeda00f 100644 --- a/common/memory.c +++ b/common/memory.c @@ -22,7 +22,7 @@ #ifndef lint static char copyright[] = -"$Id: memory.c,v 1.52.2.14 2000/07/01 05:39:47 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; +"$Id: memory.c,v 1.52.2.15 2000/07/01 05:54:22 mellon Exp $ Copyright (c) 1995, 1996, 1997, 1998, 1999 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ #include "dhcpd.h" @@ -535,9 +535,9 @@ int supersede_lease (comp, lease, commit) enter_hwaddr = 1; /* If the lease has been billed to a class, remove the billing. */ - if (comp -> billing_class && - comp -> billing_class != lease -> billing_class) { - unbill_class (comp, comp -> billing_class); + if (comp -> billing_class != lease -> billing_class) { + if (comp -> billing_class) + unbill_class (comp, comp -> billing_class); if (lease -> billing_class) bill_class (comp, lease -> billing_class); } |