[src/netbsd-1-5]: src/usr.sbin/dhcp/server Pull up revision 1.8 (requested by...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f342d52ea25d
branches:  netbsd-1-5
changeset: 491273:f342d52ea25d
user:      he <he%NetBSD.org@localhost>
date:      Sat Apr 21 19:46:19 2001 +0000

description:
Pull up revision 1.8 (requested by mellon):
  Fixes a minor accounting oversight.

diffstat:

 usr.sbin/dhcp/server/confpars.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r e2ac157dc614 -r f342d52ea25d usr.sbin/dhcp/server/confpars.c
--- a/usr.sbin/dhcp/server/confpars.c   Sat Apr 21 19:45:44 2001 +0000
+++ b/usr.sbin/dhcp/server/confpars.c   Sat Apr 21 19:46:19 2001 +0000
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: confpars.c,v 1.2.2.3 2001/04/04 20:55:40 he Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: confpars.c,v 1.2.2.4 2001/04/21 19:46:19 he Exp $ Copyright (c) 1995-2001 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -2635,6 +2635,9 @@
                                        token = BILLING;
                                        break;
                                }
+                               if (lease -> billing_class)
+                                       unbill_class (lease,
+                                                     lease -> billing_class);
                                find_class (&lease -> billing_class, val, MDL);
                                if (!lease -> billing_class)
                                        parse_warn (cfile,
@@ -2642,8 +2645,8 @@
                                parse_semi (cfile);
                        } else if (token == SUBCLASS) {
                                if (lease -> billing_class)
-                                       class_dereference
-                                               (&lease -> billing_class, MDL);
+                                       unbill_class (lease,
+                                                     lease -> billing_class);
                                parse_class_declaration
                                        (&lease -> billing_class,
                                         cfile, (struct group *)0, 3);