diff options
| author | Ted Lemon <source@isc.org> | 2000-09-30 01:31:09 +0000 |
|---|---|---|
| committer | Ted Lemon <source@isc.org> | 2000-09-30 01:31:09 +0000 |
| commit | eaa84150fd1d8ffe5a0f58078aaa9d6c74585adf (patch) | |
| tree | bd7b3ad0137c189494e620627260572c25e8002e /server/class.c | |
| parent | c2722890d6ed7c94bb7e830a540c456d65a96b88 (diff) | |
| download | isc-dhcp-eaa84150fd1d8ffe5a0f58078aaa9d6c74585adf.tar.gz | |
Re-apply part of 1.24 that was accidentally voided by 1.25
Diffstat (limited to 'server/class.c')
| -rw-r--r-- | server/class.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/server/class.c b/server/class.c index e681c340..ad08b2cc 100644 --- a/server/class.c +++ b/server/class.c @@ -43,7 +43,7 @@ #ifndef lint static char copyright[] = -"$Id: class.c,v 1.25 2000/09/29 18:20:26 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium. All rights reserved.\n"; +"$Id: class.c,v 1.26 2000/09/30 01:31:09 mellon Exp $ Copyright (c) 1998-2000 The Internet Software Consortium. All rights reserved.\n"; #endif /* not lint */ @@ -117,7 +117,8 @@ int check_collection (packet, lease, collection) status = (evaluate_boolean_expression_result (&ignorep, packet, lease, packet -> options, (struct option_state *)0, - &lease -> scope, class -> expr)); + lease ? &lease -> scope : &global_scope, + class -> expr)); if (status) { if (!class -> submatch) { matched = 1; |