From: Ted Lemon <source@isc.org>
Date: Tue, 31 Dec 1996 02:02:54 +0000 (+0000)
Subject: Fix bug in classing code
X-Git-Tag: DHCP_970222~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b289b0107c3ef496c7b94f6dd58ba9e48cc484c1;p=thirdparty%2Fdhcp.git

Fix bug in classing code
---

diff --git a/common/memory.c b/common/memory.c
index 6f7617c2f..437c9137b 100644
--- a/common/memory.c
+++ b/common/memory.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: memory.c,v 1.22 1996/11/08 20:09:10 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: memory.c,v 1.23 1996/12/31 02:02:54 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -806,7 +806,7 @@ struct class *add_class (type, name)
 		add_hash (user_class_hash,
 			  tname, strlen (tname), (unsigned char *)class);
 	else
-		add_hash (user_class_hash,
+		add_hash (vendor_class_hash,
 			  tname, strlen (tname), (unsigned char *)class);
 	return class;
 }
diff --git a/dhcp.c b/dhcp.c
index fc5e2e1ae..a78e643c0 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.34 1996/09/11 05:52:18 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.35 1996/12/31 02:02:17 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -492,7 +492,7 @@ void ack_lease (packet, lease, offer, when)
 
 	if (packet -> options [DHO_DHCP_USER_CLASS_ID].len) {
 		user_class =
-			find_class (0,
+			find_class (1,
 				    packet ->
 				    options [DHO_DHCP_USER_CLASS_ID].data,
 				    packet ->
diff --git a/memory.c b/memory.c
index 6f7617c2f..437c9137b 100644
--- a/memory.c
+++ b/memory.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: memory.c,v 1.22 1996/11/08 20:09:10 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: memory.c,v 1.23 1996/12/31 02:02:54 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -806,7 +806,7 @@ struct class *add_class (type, name)
 		add_hash (user_class_hash,
 			  tname, strlen (tname), (unsigned char *)class);
 	else
-		add_hash (user_class_hash,
+		add_hash (vendor_class_hash,
 			  tname, strlen (tname), (unsigned char *)class);
 	return class;
 }
diff --git a/server/dhcp.c b/server/dhcp.c
index fc5e2e1ae..a78e643c0 100644
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -42,7 +42,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: dhcp.c,v 1.34 1996/09/11 05:52:18 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: dhcp.c,v 1.35 1996/12/31 02:02:17 mellon Exp $ Copyright (c) 1995, 1996 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -492,7 +492,7 @@ void ack_lease (packet, lease, offer, when)
 
 	if (packet -> options [DHO_DHCP_USER_CLASS_ID].len) {
 		user_class =
-			find_class (0,
+			find_class (1,
 				    packet ->
 				    options [DHO_DHCP_USER_CLASS_ID].data,
 				    packet ->