From: Ted Lemon <source@isc.org>
Date: Sat, 30 Sep 2000 01:31:09 +0000 (+0000)
Subject: Re-apply part of 1.24 that was accidentally voided by 1.25
X-Git-Tag: V3-BETA-2-PATCH-7~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa84150fd1d8ffe5a0f58078aaa9d6c74585adf;p=thirdparty%2Fdhcp.git

Re-apply part of 1.24 that was accidentally voided by 1.25
---

diff --git a/server/class.c b/server/class.c
index e681c3409..ad08b2cc3 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;