rpms/dhcp/FC-4 dhcp-3.0.2-bz176615.patch, 1.1, 1.2 dhcp.spec, 1.69, 1.70

[fedora-cvs-commits at redhat.com]

Author: jvdias

Update of /cvs/dist/rpms/dhcp/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv10053

Modified Files:
	dhcp-3.0.2-bz176615.patch dhcp.spec 
Log Message:
apply upstream patch for bug 176615 / ISC RT#15811

dhcp-3.0.2-bz176615.patch:
 tables.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: dhcp-3.0.2-bz176615.patch
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp-3.0.2-bz176615.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dhcp-3.0.2-bz176615.patch	16 Jan 2006 21:31:04 -0000	1.1
+++ dhcp-3.0.2-bz176615.patch	20 Feb 2006 22:45:05 -0000	1.2
@@ -1,24 +1,38 @@
---- dhcp-3.0.2/server/dhcp.c.bz176615	2006-01-16 16:20:45.000000000 -0500
-+++ dhcp-3.0.2/server/dhcp.c	2006-01-16 16:21:23.000000000 -0500
-@@ -193,8 +193,19 @@
-  	 */
-   	if ((oc = lookup_option (&dhcp_universe, packet -> options,
-   				 DHO_HOST_NAME))) {
--  		if (!oc -> expression)
-- 			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+		if (!oc -> expression)
-+		{
-+			ms_nulltp = oc->flags & OPTION_HAD_NULLS;
-+			if ( (!ms_nulltp) && (oc->data.data[ oc->data.len - 1 ] == '\0') )
-+			{
-+				while (oc -> data.len &&
-+				       oc -> data.data [oc -> data.len - 1] == 0) {
-+					ms_nulltp = 1;
-+					oc -> flags |= OPTION_HAD_NULLS;
-+					oc -> data.len--;
-+				}
-+			}
-+		}
-   	}
- 
- 	/* Classify the client. */
+--- dhcp-3.0.2/common/tables.c.bz176615	2006-02-20 17:37:26.000000000 -0500
++++ dhcp-3.0.2/common/tables.c	2006-02-20 17:39:06.000000000 -0500
+@@ -102,7 +102,7 @@
+ 	{ "lpr-servers", "IA",				&dhcp_universe, 9 },
+ 	{ "impress-servers", "IA",			&dhcp_universe, 10 },
+ 	{ "resource-location-servers", "IA",		&dhcp_universe, 11 },
+-	{ "host-name", "X",				&dhcp_universe, 12 },
++	{ "host-name", "t",				&dhcp_universe, 12 },
+ 	{ "boot-size", "S",				&dhcp_universe, 13 },
+ 	{ "merit-dump", "t",				&dhcp_universe, 14 },
+ 	{ "domain-name", "t",				&dhcp_universe, 15 },
+@@ -152,7 +152,7 @@
+ 	{ "dhcp-rebinding-time", "L",			&dhcp_universe, 59 },
+ 	{ "vendor-class-identifier", "X",		&dhcp_universe, 60 },
+ 	{ "dhcp-client-identifier", "X",		&dhcp_universe, 61 },
+-	{ "nwip-domain", "X",				&dhcp_universe, 62 },
++	{ "nwip-domain", "t",				&dhcp_universe, 62 },
+ 	{ "nwip-suboptions", "Enwip.",			&dhcp_universe, 63 },
+ 	{ "nisplus-domain", "t",			&dhcp_universe, 64 },
+ 	{ "nisplus-servers", "IA",			&dhcp_universe, 65 },
+@@ -176,7 +176,7 @@
+ 	{ "unknown-83", "X",				&dhcp_universe, 83 },
+ 	{ "unknown-84", "X",				&dhcp_universe, 84 },
+ 	{ "nds-servers", "IA",				&dhcp_universe, 85 },
+-	{ "nds-tree-name", "X",				&dhcp_universe, 86 },
++	{ "nds-tree-name", "t",				&dhcp_universe, 86 },
+ 	{ "nds-context", "X",				&dhcp_universe, 87 },
+ 	{ "unknown-88", "X",				&dhcp_universe, 88 },
+ 	{ "unknown-89", "X",				&dhcp_universe, 89 },
+@@ -208,7 +208,7 @@
+ 	{ "unknown-115", "X",				&dhcp_universe, 115 },
+ 	{ "unknown-116", "X",				&dhcp_universe, 116 },
+ 	{ "unknown-117", "X",				&dhcp_universe, 117 },
+-	{ "subnet-selection", "X",			&dhcp_universe, 118 },
++	{ "subnet-selection", "I",			&dhcp_universe, 118 },
+ 	{ "unknown-119", "X",				&dhcp_universe, 119 },
+ 	{ "unknown-120", "X",				&dhcp_universe, 120 },
+ 	{ "unknown-121", "X",				&dhcp_universe, 121 },


Index: dhcp.spec
===================================================================
RCS file: /cvs/dist/rpms/dhcp/FC-4/dhcp.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- dhcp.spec	14 Feb 2006 18:37:17 -0000	1.69
+++ dhcp.spec	20 Feb 2006 22:45:05 -0000	1.70
@@ -2,7 +2,7 @@
 Summary: A DHCP (Dynamic Host Configuration Protocol) server and relay agent.
 Name:    dhcp
 Version: 3.0.2
-Release: 32.FC4
+Release: 34.FC4
 Epoch:   10
 License: distributable
 Group: System Environment/Daemons
@@ -311,6 +311,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Feb 20 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-34
+- Apply upstream fix for bug 176615 / ISC RT#15811
+
 * Tue Feb 14 2006 Jason Vas Dias <jvdias at redhat.com> - 11:3.0.2-32
 - fix bug 181482: resolv.conf not updated on RENEW :
   since dhcp-3.0.1rc12-RHScript.patch: "$new_domain_servers" should have