mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-29 13:28:14 +00:00
Code Issues Releases Wiki Activity

Fix a billing class counting error

Browse Source
This commit is contained in:
Ted Lemon 2001-04-27 22:23:44 +00:00
parent a010c3ffb3
commit f545ef7f0d
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
server/confpars.c
View File

@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: confpars.c,v 1.140 2001/04/20 18:07:29 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n"; "$Id: confpars.c,v 1.141 2001/04/27 22:23:44 mellon Exp $ Copyright (c) 1995-2001 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@ -2385,6 +2385,7 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
pair *p; pair *p;
binding_state_t new_state; binding_state_t new_state;
unsigned buflen = 0; unsigned buflen = 0;
struct class *class;
lease = (struct lease *)0; lease = (struct lease *)0;
status = lease_allocate (&lease, MDL); status = lease_allocate (&lease, MDL);
@ -2640,6 +2641,7 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
case BILLING: case BILLING:
seenbit = 2048; seenbit = 2048;
class = (struct class *)0;
token = next_token (&val, (unsigned *)0, cfile); token = next_token (&val, (unsigned *)0, cfile);
if (token == CLASS) { if (token == CLASS) {
token = next_token (&val, token = next_token (&val,
@ -2654,8 +2656,8 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
if (lease -> billing_class) if (lease -> billing_class)
unbill_class (lease, unbill_class (lease,
lease -> billing_class); lease -> billing_class);
find_class (&lease -> billing_class, val, MDL); find_class (&class, val, MDL);
if (!lease -> billing_class) if (!class)
parse_warn (cfile, parse_warn (cfile,
"unknown class %s", val); "unknown class %s", val);
parse_semi (cfile); parse_semi (cfile);
@ -2664,13 +2666,17 @@ int parse_lease_declaration (struct lease **lp, struct parse *cfile)
unbill_class (lease, unbill_class (lease,
lease -> billing_class); lease -> billing_class);
parse_class_declaration parse_class_declaration
(&lease -> billing_class, (&class,
cfile, (struct group *)0, 3); cfile, (struct group *)0, 3);
} else { } else {
parse_warn (cfile, "expecting \"class\""); parse_warn (cfile, "expecting \"class\"");
if (token != SEMI) if (token != SEMI)
skip_to_semi (cfile); skip_to_semi (cfile);
} }
if (class) {
bill_class (lease, class);
class_dereference (&class, MDL);
}
break; break;
case ON: case ON: