summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Hankins <dhankins@isc.org>2005-02-22 21:02:51 +0000
committerDavid Hankins <dhankins@isc.org>2005-02-22 21:02:51 +0000
commitfd74fde1c9e35a18f3eade9462e970c72b8e215e (patch)
tree77af7baad96e7cb3585faf3227d1f7360256f4e3
parentd735a60c0ec11e3079619828e1c6628de3efb96e (diff)
downloadisc-dhcp-fd74fde1c9e35a18f3eade9462e970c72b8e215e.tar.gz
- merge rt13251
-rw-r--r--RELNOTES3
-rw-r--r--client/dhclient.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/RELNOTES b/RELNOTES
index 1b0624b3..857c649b 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -66,6 +66,9 @@ and for prodding me into improving it.
alignment of the 32-bit IP address value. Thanks to a patch from Dr.
Peter Poeml.
+- An incorrect log message was corrected thanks to a patch from
+ Dr. Peter Poeml.
+
Changes since 3.0.2rc3
- A previously undocumented configuration directive, 'local-address',
diff --git a/client/dhclient.c b/client/dhclient.c
index 4dd27cd9..6ffe47f8 100644
--- a/client/dhclient.c
+++ b/client/dhclient.c
@@ -32,7 +32,7 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.129.2.24 2005/02/22 20:51:34 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.129.2.25 2005/02/22 21:02:51 dhankins Exp $ Copyright (c) 2004 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -1253,7 +1253,7 @@ struct client_lease *packet_to_lease (packet, client)
break;
lease -> server_name = dmalloc (len + 1, MDL);
if (!lease -> server_name) {
- log_error ("dhcpoffer: no memory for filename.\n");
+ log_error ("dhcpoffer: no memory for server name.\n");
destroy_client_lease (lease);
return (struct client_lease *)0;
} else {