Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/dist/dhcp merge dhcp-3.0.1rc11
details: https://anonhg.NetBSD.org/src/rev/1e9271eedc66
branches: trunk
changeset: 543173:1e9271eedc66
user: drochner <drochner%NetBSD.org@localhost>
date: Tue Feb 18 17:08:38 2003 +0000
description:
merge dhcp-3.0.1rc11
diffstat:
dist/dhcp/Makefile.conf | 2 +-
dist/dhcp/README | 16 +-
dist/dhcp/RELNOTES | 70 ++-
dist/dhcp/client/dhclient-script.8 | 5 +-
dist/dhcp/client/dhclient.8 | 7 +-
dist/dhcp/client/dhclient.c | 29 +-
dist/dhcp/client/dhclient.conf.5 | 15 +-
dist/dhcp/client/dhclient.leases.5 | 5 +-
dist/dhcp/client/scripts/freebsd | 12 +-
dist/dhcp/client/scripts/linux | 2 +-
dist/dhcp/common/alloc.c | 4 +-
dist/dhcp/common/bpf.c | 8 +-
dist/dhcp/common/comapi.c | 4 +-
dist/dhcp/common/dhcp-eval.5 | 2 +-
dist/dhcp/common/dhcp-options.5 | 17 +-
dist/dhcp/common/discover.c | 10 +-
dist/dhcp/common/dispatch.c | 2 +-
dist/dhcp/common/dlpi.c | 2 +-
dist/dhcp/common/dns.c | 4 +-
dist/dhcp/common/ethernet.c | 2 +-
dist/dhcp/common/execute.c | 4 +-
dist/dhcp/common/fddi.c | 6 +-
dist/dhcp/common/icmp.c | 6 +-
dist/dhcp/common/inet.c | 4 +-
dist/dhcp/common/lpf.c | 2 +-
dist/dhcp/common/memory.c | 4 +-
dist/dhcp/common/nit.c | 2 +-
dist/dhcp/common/packet.c | 4 +-
dist/dhcp/common/parse.c | 95 ++-
dist/dhcp/common/print.c | 4 +-
dist/dhcp/common/raw.c | 4 +-
dist/dhcp/common/resolv.c | 4 +-
dist/dhcp/common/socket.c | 6 +-
dist/dhcp/common/tables.c | 4 +-
dist/dhcp/common/tr.c | 2 +-
dist/dhcp/common/tree.c | 4 +-
dist/dhcp/common/upf.c | 2 +-
dist/dhcp/dhcpctl/callback.c | 2 +-
dist/dhcp/dhcpctl/dhcpctl.c | 2 +-
dist/dhcp/dhcpctl/omshell.c | 9 +-
dist/dhcp/dhcpctl/remote.c | 14 +-
dist/dhcp/dst/hmac_link.c | 4 +-
dist/dhcp/includes/dhcpd.h | 6 +-
dist/dhcp/includes/version.h | 2 +-
dist/dhcp/minires/ns_name.c | 10 +-
dist/dhcp/minires/ns_samedomain.c | 4 +-
dist/dhcp/minires/ns_sign.c | 4 +-
dist/dhcp/minires/res_findzonecut.c | 4 +-
dist/dhcp/omapip/alloc.c | 6 +-
dist/dhcp/omapip/message.c | 13 +-
dist/dhcp/relay/dhcrelay.8 | 5 +-
dist/dhcp/relay/dhcrelay.c | 12 +-
dist/dhcp/server/bootp.c | 4 +-
dist/dhcp/server/class.c | 4 +-
dist/dhcp/server/confpars.c | 42 +-
dist/dhcp/server/db.c | 28 +-
dist/dhcp/server/ddns.c | 4 +-
dist/dhcp/server/dhcp.c | 30 +-
dist/dhcp/server/dhcpd.8 | 5 +-
dist/dhcp/server/dhcpd.c | 6 +-
dist/dhcp/server/dhcpd.conf.5 | 5 +-
dist/dhcp/server/dhcpd.leases.5 | 5 +-
dist/dhcp/server/omapi.c | 8 +-
dist/dhcp/server/salloc.c | 2 +-
dist/dhcp/server/stables.c | 1020 +++++++++++++++++-----------------
65 files changed, 903 insertions(+), 732 deletions(-)
diffs (truncated from 2953 to 300 lines):
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/Makefile.conf
--- a/dist/dhcp/Makefile.conf Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/Makefile.conf Tue Feb 18 17:08:38 2003 +0000
@@ -1,6 +1,6 @@
# Makefile.conf
#
-# Copyright (c) 1996-2000 Internet Software Consortium.
+# Copyright (c) 1996-2002 Internet Software Consortium.
# Use is subject to license terms which appear in the file named
# ISC-LICENSE that should have accompanied this file when you
# received it. If a file named ISC-LICENSE did not accompany this
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/README
--- a/dist/dhcp/README Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/README Tue Feb 18 17:08:38 2003 +0000
@@ -97,7 +97,7 @@
RELEASE STATUS
-This is the ninth release candidate of version 3.0.1 of the ISC DHCP
+This is the tenth release candidate of version 3.0.1 of the ISC DHCP
Distribution. Development of this release is approaching the point at
which it will be frozen, and no significant new features will be
added.
@@ -143,14 +143,14 @@
To build the DHCP Distribution, unpack the compressed tar file using
the tar utility and the gzip command - type something like:
- zcat dhcp-3.0.1rc9.tar.gz |tar xvf -
+ zcat dhcp-3.0.1rc11.tar.gz |tar xvf -
On BSD/OS, you have to type gzcat, not zcat, and you may run into
similar problems on other operating systems.
CONFIGURING IT
-Now, cd to the dhcp-3.0.1rc9 subdirectory that you've just
+Now, cd to the dhcp-3.0.1rc11 subdirectory that you've just
created and configure the source tree by typing:
./configure
@@ -244,16 +244,6 @@
problems for Linux 2.1/2.2: the "SO_ATTACH_FILTER undeclared" problem
and the "protocol not configured" problem.
- LINUX: IF_TR.H NOT FOUND
-
-When you compile the distribution on Linux, you may get an error
-message indicating that the include file if_tr.h could not be found.
-If this happens, go into includes/cf/linux.h and delete the line that
-defined HAVE_TR_SUPPORT, or look into installing a new version of libc
-that includes the if_tr.h file. We will be working on removing this
-problem in the future, but for now, if you run into it, this should be
-a viable workaround.
-
LINUX: SO_ATTACH_FILTER UNDECLARED
In addition, there is a minor issue that we will mention here because
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/RELNOTES
--- a/dist/dhcp/RELNOTES Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/RELNOTES Tue Feb 18 17:08:38 2003 +0000
@@ -1,7 +1,7 @@
Internet Software Consortium DHCP Distribution
Version 3.0.1
- Release Candidate 9
- April 30, 2002
+ Release Candidate 10
+ June, 2002
Release Notes
@@ -46,6 +46,72 @@
thanks to all of these good people here, both for working on the code
and for prodding me into improving it.
+ Changes since 3.0.1rc10
+
+- Potential buffer overflows in minires repaired.
+
+- A change to the linux client script to use /bin/bash, since /bin/sh may
+ not be bash.
+
+- Some missing va_end cleanups thanks to a patch from Thomas Klausner.
+
+- A correction of boolean parsing syntax validation - some illegal syntaxes
+ that worked before are now detected and produce errs, some legal syntaxes
+ that errored before will now work properly.
+
+- Some search-and-replace errors that caused some options to change their
+ names was repaired.
+
+- Shu-min Chang of the Intel corporation has contributed a perl script and
+ module that converts the MS NT4 DHCP configuration to a ISC DHCP3
+ configuration file.
+
+- Applied the remainder of the dhcpctl memory leak patch provided by Bill
+ Squier at ReefEdge, Inc. (groo%reefedge.com@localhost).
+
+- Missing non-optional failover peer configurations will now result in a soft
+ error rather than a null dereference.
+
+ Changes since 3.0.1rc9
+
+- A format string was corrected to fix compiler warnings.
+
+- A number of spelling corrections were made in the man pages.
+
+- The dhclient.conf.5 man page was changed to refer to do-forward-updates
+ rather than a configuration option that doesn't exist.
+
+- A FreeBSD-specific bug in the interface removal handling was fixed.
+
+- A Linux-specific Token Ring detection problem was fixed.
+
+- Hashes removed from as-yet-unknown agent options, having those options
+ appear in reality before we know about them will no longer produce
+ self-corrupting lease databases.
+
+- dhclient will use the proper port numbers now when using the -g option.
+
+- A order-of-operations bug with 2 match clauses in 1 class statement is
+ fixed thanks to a patch from Andrew Matheson.
+
+- Compilation problems on Solaris were fixed.
+
+- Compilation problems when built with DEBUG or DEBUG_PACKET were repaired.
+
+- A fix to the dhcp ack process which makes certain group options will be
+ included in the first DHCPOFFER message was made thanks to a patch from
+ Ling Gou.
+
+- A few memory leaks were repaired thanks to patches from Bill Squier at
+ ReefEdge, Inc. (groo%reefedge.com@localhost).
+
+- A fix for shared-networks that sometimes give clients options for the
+ wrong subnets (in particular, 'option routers') was applied, thanks to
+ Ted Lemon for the patch.
+
+- Omshell's handling of dotted octets as values was changed such that dots
+ one after the other produce zero values in the integer string.
+
Changes since 3.0.1rc8
- Fix a format string vulnerability in the server that could lead to a
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/client/dhclient-script.8
--- a/dist/dhcp/client/dhclient-script.8 Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/client/dhclient-script.8 Tue Feb 18 17:08:38 2003 +0000
@@ -1,6 +1,6 @@
.\" dhclient-script.8
.\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -34,6 +34,9 @@
.\" ``http://www.isc.org/''. To learn more about Vixie Enterprises,
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
+.\"
+.\" $Id: dhclient-script.8,v 1.4 2003/02/18 17:08:39 drochner Exp $
+.\"
.TH dhclient-script 8
.SH NAME
dhclient-script - DHCP client network configuration script
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/client/dhclient.8
--- a/dist/dhcp/client/dhclient.8 Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/client/dhclient.8 Tue Feb 18 17:08:38 2003 +0000
@@ -1,6 +1,6 @@
.\" dhclient.8
.\"
-.\" Copyright (c) 1996-1999 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
.\" Use is subject to license terms which appear in the file named
.\" ISC-LICENSE that should have accompanied this file when you
.\" received it. If a file named ISC-LICENSE did not accompany this
@@ -15,6 +15,9 @@
.\"
.\" Support and other services are available for ISC products - see
.\" http://www.isc.org for more information.
+.\"
+.\" $Id: dhclient.8,v 1.5 2003/02/18 17:08:39 drochner Exp $
+.\"
.TH dhclient 8
.SH NAME
dhclient - Dynamic Host Configuration Protocol (DHCP) Client
@@ -140,7 +143,7 @@
The names of the network interfaces that dhclient should attempt to
configure may be specified on the command line. If no interface names
are specified on the command line dhclient will normally identify all
-network interfaces, elimininating non-broadcast interfaces if
+network interfaces, eliminating non-broadcast interfaces if
possible, and attempt to configure each interface.
.PP
It is also possible to specify interfaces by name in the
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/client/dhclient.c
--- a/dist/dhcp/client/dhclient.c Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/client/dhclient.c Tue Feb 18 17:08:38 2003 +0000
@@ -41,7 +41,7 @@
#ifndef lint
static char ocopyright[] =
-"$Id: dhclient.c,v 1.7 2002/06/11 14:27:21 drochner Exp $ Copyright (c) 1995-2001 Internet Software Consortium. All rights reserved.\n";
+"$Id: dhclient.c,v 1.8 2003/02/18 17:08:39 drochner Exp $ Copyright (c) 1995-2002 Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -71,19 +71,19 @@
assert (state_is == state_shouldbe). */
#define ASSERT_STATE(state_is, state_shouldbe) {}
-static char copyright[] = "Copyright 1995-2001 Internet Software Consortium.";
+static char copyright[] = "Copyright 1995-2002 Internet Software Consortium.";
static char arr [] = "All rights reserved.";
static char message [] = "Internet Software Consortium DHCP Client";
static char url [] = "For info, please visit http://www.isc.org/products/DHCP";;
-u_int16_t local_port;
-u_int16_t remote_port;
-int no_daemon;
-struct string_list *client_env;
-int client_env_count;
-int onetry;
-int quiet;
-int nowait;
+u_int16_t local_port=0;
+u_int16_t remote_port=0;
+int no_daemon=0;
+struct string_list *client_env=NULL;
+int client_env_count=0;
+int onetry=0;
+int quiet=0;
+int nowait=0;
static void usage PROTO ((void));
@@ -289,8 +289,10 @@
/* Default to the DHCP/BOOTP port. */
if (!local_port) {
+ /* If we're faking a relay agent, and we're not using loopback,
+ use the server port, not the client port. */
if (relay && giaddr.s_addr != htonl (INADDR_LOOPBACK)) {
- local_port = htons (67);
+ local_port = htons(67);
} else {
ent = getservbyname ("dhcpc", "udp");
if (!ent)
@@ -304,13 +306,12 @@
}
/* If we're faking a relay agent, and we're not using loopback,
- use the server port, not the client port. */
+ we're using the server port, not the client port. */
if (relay && giaddr.s_addr != htonl (INADDR_LOOPBACK)) {
- local_port = htons (ntohs (local_port) - 1);
remote_port = local_port;
} else
remote_port = htons (ntohs (local_port) - 1); /* XXX */
-
+
/* Get the current time... */
GET_TIME (&cur_time);
diff -r d21454dd10e4 -r 1e9271eedc66 dist/dhcp/client/dhclient.conf.5
--- a/dist/dhcp/client/dhclient.conf.5 Tue Feb 18 16:42:40 2003 +0000
+++ b/dist/dhcp/client/dhclient.conf.5 Tue Feb 18 17:08:38 2003 +0000
@@ -1,6 +1,6 @@
.\" dhclient.conf.5
.\"
-.\" Copyright (c) 1996-2001 Internet Software Consortium.
+.\" Copyright (c) 1996-2002 Internet Software Consortium.
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
.\" are met:
@@ -34,6 +34,9 @@
.\" ``http://www.isc.org/''. To learn more about Vixie Enterprises,
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
+.\"
+.\" $Id: dhclient.conf.5,v 1.4 2003/02/18 17:08:39 drochner Exp $
+.\"
.TH dhclient.conf 5
.SH NAME
dhclient.conf - DHCP client configuration file
@@ -249,19 +252,19 @@
\fIon\fR or \fIoff\fR, depending on the DHCP server you are using.
.PP
.I The
-.B no-client-updates
+.B do-forward-updates
.I statement
.PP
- \fBno-client-updates [ \fIflag\fR ] \fB;\fR
+ \fBdo-forward-updates [ \fIflag\fR ] \fB;\fR
.PP
If you want to do DNS updates in the DHCP client
script (see \fBdhclient-script(8)\fR) rather than having the
DHCP client do the update directly (for example, if you want to
use SIG(0) authentication, which is not supported directly by the
DHCP client, you can instruct the client not to do the update using
Home |
Main Index |
Thread Index |
Old Index