- merge rt13251

diff --git a/RELNOTES b/RELNOTES
index 1b0624b3f7ba1d50a3b58359d489875c96d6f2bf..857c649bbc52b0b32a17b272f37014e0f1e1dbc9 100644 (file)
--- 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 4dd27cd989bcbd249374c188a52928deb2891b77..6ffe47f89736c61739ec494e5296208e3846cede 100644 (file)
--- 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 {