diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-05-07 15:36:54 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-06-07 11:47:50 -0400 |
| commit | fce94f06e3b05584390ae4704b0ada72b10463e0 (patch) | |
| tree | 7c31b9d1bb0bb87ad8717333650f0292c21d7a28 /server | |
| parent | cb89a69139eddbd11ee776caacd68f9baaefe285 (diff) | |
| download | isc-dhcp-fce94f06e3b05584390ae4704b0ada72b10463e0.tar.gz | |
[#13,!7] Corrected a backwards check in billing class logic
RELNOTES - added a release note.
server/dhcp.c
ack_lease () - corrected the logic used to capture the billing
class name for logging
Diffstat (limited to 'server')
| -rw-r--r-- | server/dhcp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/dhcp.c b/server/dhcp.c index 0529662c..6d129ec9 100644 --- a/server/dhcp.c +++ b/server/dhcp.c @@ -2562,7 +2562,7 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) int bill = 0; for (i = 0; i < packet->class_count; i++) { - struct class *billclass, *subclass; + struct class *billclass, *superclass; billclass = packet->classes[i]; if (billclass->lease_limit) { @@ -2570,9 +2570,9 @@ void ack_lease (packet, lease, offer, when, msg, ms_nulltp, hp) if (bill_class(lease, billclass)) break; - subclass = billclass->superclass; - if (subclass == NULL) - cname = subclass->name; + superclass = billclass->superclass; + if (superclass != NULL) + cname = superclass->name; else cname = billclass->name; } |