diff options
author | David Hankins <dhankins@isc.org> | 2005-02-22 21:02:51 +0000 |
---|---|---|
committer | David Hankins <dhankins@isc.org> | 2005-02-22 21:02:51 +0000 |
commit | fd74fde1c9e35a18f3eade9462e970c72b8e215e (patch) | |
tree | 77af7baad96e7cb3585faf3227d1f7360256f4e3 | |
parent | d735a60c0ec11e3079619828e1c6628de3efb96e (diff) | |
download | isc-dhcp-fd74fde1c9e35a18f3eade9462e970c72b8e215e.tar.gz |
- merge rt13251
-rw-r--r-- | RELNOTES | 3 | ||||
-rw-r--r-- | client/dhclient.c | 4 |
2 files changed, 5 insertions, 2 deletions
@@ -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 { |