system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-04 23:50:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflicts.

Browse source
This commit is contained in:
Martin Blapp 2003-09-02 11:13:21 +00:00
parent c262a571d1
commit fb26c675fb
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=119674
5 changed files with 699 additions and 686 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
contrib/isc-dhcp/client/clparse.c
View file

@ -43,7 +43,7 @@
#ifndef lint
static char copyright[] =
"$Id: clparse.c,v 1.62.2.3 2002/11/17 02:25:43 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n"
"$Id: clparse.c,v 1.62.2.4 2003/02/10 00:39:57 dhankins Exp $ Copyright (c) 1996-2002 The Internet Software Consortium. All rights reserved.\n"
"$FreeBSD$\n";
#endif /* not lint */
@ -620,34 +620,41 @@ void parse_option_list (cfile, list)
struct parse *cfile;
u_int32_t **list;
{
int ix, i;
int ix;
int token;
const char *val;
pair p = (pair)0, q, r;
struct option *option;
ix = 0;
do {
token = next_token (&val, (unsigned *)0, cfile);
if (token == SEMI)
token = peek_token (&val, (unsigned *)0, cfile);
if (token == SEMI) {
token = next_token (&val, (unsigned *)0, cfile);
break;
}
if (!is_identifier (token)) {
parse_warn (cfile, "%s: expected option name.", val);
token = next_token (&val, (unsigned *)0, cfile);
skip_to_semi (cfile);
return;
}
for (i = 0; i < 256; i++) {
if (!strcasecmp (dhcp_options [i].name, val))
break;
}
if (i == 256) {
option = parse_option_name (cfile, 0, NULL);
if (!option) {
parse_warn (cfile, "%s: expected option name.", val);
return;
}
if (option -> universe != &dhcp_universe) {
parse_warn (cfile,
"%s.%s: Only global options allowed.",
option -> universe -> name, option->name );
skip_to_semi (cfile);
return;
}
r = new_pair (MDL);
if (!r)
log_fatal ("can't allocate pair for option code.");
r -> car = (caddr_t)(long)i;
r -> car = (caddr_t)(long)option -> code;
r -> cdr = (pair)0;
if (p)
q -> cdr = r;

4
contrib/isc-dhcp/client/dhclient.conf.5
View file

@ -35,7 +35,7 @@
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
.\"
.\" $Id: dhclient.conf.5,v 1.12.2.8 2002/11/17 02:25:43 dhankins Exp $
.\" $Id: dhclient.conf.5,v 1.12.2.9 2003/02/23 03:27:26 dhankins Exp $
.\" $FreeBSD$
.\"
.TH dhclient.conf 5
@ -447,7 +447,7 @@ automatically determine the type of network to which they are
connected. The media setup string is a system-dependent parameter
which is passed to the dhcp client configuration script when
initializing the interface. On Unix and Unix-like systems, the
argument is passed on the ifconfig command line when configuring te
argument is passed on the ifconfig command line when configuring the
interface.
.PP
The dhcp client automatically declares this parameter if it uses a

30
contrib/isc-dhcp/common/dhcp-options.5
View file

@ -35,7 +35,7 @@
.\" see ``http://www.vix.com''. To learn more about Nominum, Inc., see
.\" ``http://www.nominum.com''.
.\"
.\" $Id: dhcp-options.5,v 1.19.2.9 2002/11/17 02:26:57 dhankins Exp $
.\" $Id: dhcp-options.5,v 1.19.2.10 2003/02/23 03:27:42 dhankins Exp $
.\" $FreeBSD$
.\"
.TH dhcpd-options 5
@ -222,7 +222,7 @@ sending TCP segments. The minimum value is 1.
.B option \fBdhcp-client-identifier\fR \fIstring\fR\fB;\fR
.RS 0.25i
.PP
This option can be used to specify the a DHCP client identifier in a
This option can be used to specify a DHCP client identifier in a
host declaration, so that dhcpd can find the host record by matching
against the client identifier.
.PP
@ -412,8 +412,8 @@ RFC2132.
\fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
The Finger server option specifies a list of Finger available to the
client. Servers should be listed in order of preference.
The Finger server option specifies a list of Finger servers available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBfont-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
@ -485,8 +485,8 @@ forwarding, and a value of true means enable IP forwarding.
\fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
The IRC server option specifies a list of IRC available to the
client. Servers should be listed in order of preference.
The IRC server option specifies a list of IRC servers available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBlog-servers\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...
@ -593,7 +593,7 @@ Possible node types are:
B-node: Broadcast - no WINS
.TP
.I 2
P-node: Peer - WINS only.
P-node: Peer - WINS only
.TP
.I 4
M-node: Mixed - broadcast, then WINS
@ -648,8 +648,8 @@ preference.
\fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
The NNTP server option specifies a list of NNTP available to the
client. Servers should be listed in order of preference.
The NNTP server option specifies a list of NNTP servesr available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBnon-local-source-routing\fR \fIflag\fR\fB;\fR
@ -733,8 +733,8 @@ See STD 3 (RFC1122) for further information.
.B option \fBpop-server\fR \fIip-address\fR [\fB,\fR \fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
The POP3 server option specifies a list of POP3 available to the
client. Servers should be listed in order of preference.
The POP3 server option specifies a list of POP3 servers available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBresource-location-servers\fR \fIip-address\fR
@ -905,8 +905,8 @@ This specifies the IP address of the client's swap server.
.B option \fBtcp-keepalive-garbage\fR \fIflag\fR\fB;\fR
.RS 0.25i
.PP
This option specifies the whether or not the client should send TCP
keepalive messages with a octet of garbage for compatibility with
This option specifies whether or not the client should send TCP
keepalive messages with an octet of garbage for compatibility with
older implementations. A value of false indicates that a garbage octet
should not be sent. A value of true indicates that a garbage octet
should be sent.
@ -1031,8 +1031,8 @@ details.
\fIip-address\fR... ]\fB;\fR
.RS 0.25i
.PP
The WWW server option specifies a list of WWW available to the
client. Servers should be listed in order of preference.
The WWW server option specifies a list of WWW servers available
to the client. Servers should be listed in order of preference.
.RE
.PP
.B option \fBx-display-manager\fR \fIip-address\fR [\fB,\fR \fIip-address\fR...

1319
contrib/isc-dhcp/common/tables.c
View file

File diff suppressed because it is too large Load diff

5
contrib/isc-dhcp/includes/dhcpd.h
View file

@ -425,6 +425,11 @@ struct lease_state {
#define SV_UPDATE_STATIC_LEASES 43
#define SV_LOG_FACILITY 44
#define SV_DO_FORWARD_UPDATES 45
#define SV_PING_TIMEOUT 46
#if !defined (DEFAULT_PING_TIMEOUT)
# define DEFAULT_PING_TIMEOUT 1
#endif
#if !defined (DEFAULT_DEFAULT_LEASE_TIME)
# define DEFAULT_DEFAULT_LEASE_TIME 43200