Attachment 21119 Details for Bug 56975

[patch] includes patches

2004-06-11_2.txt (text/plain), 3.59 KB, created by Thomas Biege on 2004-06-14 18:15:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Biege

Created: 2004-06-14 18:15:47 UTC

Size: 3.59 KB

patch

obsolete

>Hello Folks,
>
>We have received an 'interim patch' from ISC. ISC has stated that this
>patch is fine for testing, but vendors should roll new versions of the
>tarball containing the updated distribution information. ISC said that
>they would try to supply that to us for distribution early monday morning.
>The patch is supplied below.
>
>Thank you,
>	Jason Rafail
>
>==============================
>Member of the Technical Staff
>CERT Coordination Center
>Software Engineering Institute
>Carnegie Mellon University
>4500 Fifth Avenue
>Pittsburgh, PA 15213
>1-412-268-7090
>==============================
>
>
>
>--- BEGIN INTERIM PATCH ---
>
>? work.freebsd
>Index: server/dhcp.c
>===================================================================
>RCS file: /proj/cvs/prod/DHCP/server/dhcp.c,v
>retrieving revision 1.192.2.30
>diff -u -r1.192.2.30 dhcp.c
>--- server/dhcp.c	9 Jan 2004 00:41:00 -0000	1.192.2.30
>+++ server/dhcp.c	8 Jun 2004 18:46:24 -0000
>@@ -268,10 +268,13 @@
> 	find_lease (&lease, packet, packet -> shared_network,
> 		    0, &allocatedp, (struct lease *)0, MDL);
>
>-	if (lease && lease -> client_hostname &&
>-	    db_printable (lease -> client_hostname))
>-		s = lease -> client_hostname;
>-	else
>+	if (lease && lease -> client_hostname) {
>+		if ((strlen (lease -> client_hostname) <= 64) &&
>+		    db_printable (lease -> client_hostname))
>+			s = lease -> client_hostname;
>+		else
>+			s = "Hostname Unsuitable for Printing";
>+	} else
> 		s = (char *)0;
>
> 	/* Say what we're doing... */
>@@ -446,10 +449,13 @@
> 	/* XXX consider using allocatedp arg to find_lease to see
> 	   XXX that this isn't a compliant DHCPREQUEST. */
>
>-	if (lease && lease -> client_hostname &&
>-	    db_printable (lease -> client_hostname))
>-		s = lease -> client_hostname;
>-	else
>+	if (lease && lease -> client_hostname) {
>+		if ((strlen (lease -> client_hostname) <= 64) &&
>+		    db_printable (lease -> client_hostname))
>+			s = lease -> client_hostname;
>+		else
>+			s = "Hostname Unsuitable for Printing";
>+	} else
> 		s = (char *)0;
>
> 	oc = lookup_option (&dhcp_universe, packet -> options,
>@@ -742,10 +748,13 @@
> 		     packet -> raw -> chaddr, packet -> raw -> hlen)))
> 		lease_dereference (&lease, MDL);
>
>-	if (lease && lease -> client_hostname &&
>-	    db_printable (lease -> client_hostname))
>-		s = lease -> client_hostname;
>-	else
>+	if (lease && lease -> client_hostname) {
>+		if ((strlen (lease -> client_hostname) <= 64) &&
>+		    db_printable (lease -> client_hostname))
>+			s = lease -> client_hostname;
>+		else
>+			s = "Hostname Unsuitable for Printing";
>+	} else
> 		s = (char *)0;
>
> 	strncpy(cstr, inet_ntoa (packet -> raw -> ciaddr), 15);
>@@ -830,10 +839,13 @@
> 	data_string_forget (&data, MDL);
> 	find_lease_by_ip_addr (&lease, cip, MDL);
>
>-	if (lease && lease -> client_hostname &&
>-	    db_printable (lease -> client_hostname))
>-		s = lease -> client_hostname;
>-	else
>+	if (lease && lease -> client_hostname) {
>+		if ((strlen (lease -> client_hostname) <= 64) &&
>+		    db_printable (lease -> client_hostname))
>+			s = lease -> client_hostname;
>+		else
>+			s = "Hostname Unsuitable for Printing";
>+	} else
> 		s = (char *)0;
>
> 	sprintf (msgbuf, "DHCPDECLINE of %s from %s %s%s%svia %s",
>@@ -2748,10 +2760,13 @@
> 	raw.hops = state -> hops;
> 	raw.op = BOOTREPLY;
>
>-	if (lease -> client_hostname &&
>-	    db_printable (lease -> client_hostname))
>-		s = lease -> client_hostname;
>-	else
>+	if (lease -> client_hostname) {
>+		if ((strlen (lease -> client_hostname) <= 64) &&
>+		    db_printable (lease -> client_hostname))
>+			s = lease -> client_hostname;
>+		else
>+			s = "Hostname Unsuitable for Printing";
>+	} else
> 		s = (char *)0;
>
> 	/* Say what we're doing... */
>
>
>---  END  INTERIM PATCH ---
>

Actions: View | Diff

Attachments on bug 56975: 21118 | 21119 | 21120 | 21122 | 21123 | 21124 | 21126 | 21160 | 21196 | 21254 | 21301 | 21307 | 21354 | 21425 | 21634 | 21635 | 21636