summaryrefslogtreecommitdiff
path: root/server/dhcp.c
diff options
context:
space:
mode:
authorThomas Markwalder <tmark@isc.org>2015-07-29 08:32:50 -0400
committerThomas Markwalder <tmark@isc.org>2015-07-29 08:32:50 -0400
commit6a39bcf0be695fa2e0b62312ea8bdc830a08f7bc (patch)
treefd823fce88d2d70954c8c0a7be9f93d7b6736144 /server/dhcp.c
parent673137b13addbcb5b8f672f6d905e979a02fa69e (diff)
downloadisc-dhcp-6a39bcf0be695fa2e0b62312ea8bdc830a08f7bc.tar.gz
[master] Fixed server crash after billing class is deleted
Merges in rt39978.
Diffstat (limited to 'server/dhcp.c')
-rw-r--r--server/dhcp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/dhcp.c b/server/dhcp.c
index 5db75f75..1f007e29 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -2321,7 +2321,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
lease -> billing_class)
break;
if (i == packet -> class_count) {
- unbill_class (lease, lease -> billing_class);
+ unbill_class(lease);
/* Active lease billing change negates reuse */
if (lease->binding_state == FTS_ACTIVE) {
lease->cannot_reuse = 1;
@@ -2373,7 +2373,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp)
if (offer == DHCPOFFER &&
lease->billing_class != NULL &&
lease->binding_state != FTS_ACTIVE)
- unbill_class(lease, lease->billing_class);
+ unbill_class(lease);
/* Lease billing change negates reuse */
if (lease->billing_class != NULL) {