rpms/dhcp/FC-4 dhcp-3.0.2-bz176615.patch,NONE,1.1

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Added Files:
	dhcp-3.0.2-bz176615.patch 
Log Message:
fix bug 176615

dhcp-3.0.2-bz176615.patch:
 dhcp.c |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

--- NEW FILE dhcp-3.0.2-bz176615.patch ---
--- 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. */