diff options
| author | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-17 18:03:34 +0000 |
|---|---|---|
| committer | Kevin Steves <stevesk@cvs.openbsd.org> | 2006-12-17 18:03:34 +0000 |
| commit | 484cfbed8914c70668e8b771b3fbfbe6f06e5862 (patch) | |
| tree | e30c35c514f0ad623256a959be87d8d8e21c6a1d /usr.sbin | |
| parent | 15d9d92afe468313bc884d8a7784062348e20546 (diff) | |
remove one-lease-per-client parameter which was never implemented (it
doesn't do anything and is not documented); ok henning@
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/dhcpd/conflex.c | 3 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/confpars.c | 11 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/dhcpd.h | 3 | ||||
| -rw-r--r-- | usr.sbin/dhcpd/dhctoken.h | 3 |
4 files changed, 4 insertions, 16 deletions
diff --git a/usr.sbin/dhcpd/conflex.c b/usr.sbin/dhcpd/conflex.c index fa0fe596485..523b4c01c93 100644 --- a/usr.sbin/dhcpd/conflex.c +++ b/usr.sbin/dhcpd/conflex.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conflex.c,v 1.8 2006/04/20 19:50:08 deraadt Exp $ */ +/* $OpenBSD: conflex.c,v 1.9 2006/12/17 18:03:33 stevesk Exp $ */ /* Lexical scanner for dhcpd config file... */ @@ -342,7 +342,6 @@ static const struct keywords { { "netmask", TOK_NETMASK }, { "next-server", TOK_NEXT_SERVER }, { "not", TOK_TOKEN_NOT }, - { "one-lease-per-client", TOK_ONE_LEASE_PER_CLIENT }, { "option", TOK_OPTION }, { "range", TOK_RANGE }, { "server-identifier", TOK_SERVER_IDENTIFIER }, diff --git a/usr.sbin/dhcpd/confpars.c b/usr.sbin/dhcpd/confpars.c index ab8eee3b979..9436953f3d1 100644 --- a/usr.sbin/dhcpd/confpars.c +++ b/usr.sbin/dhcpd/confpars.c @@ -1,4 +1,4 @@ -/* $OpenBSD: confpars.c,v 1.15 2006/06/13 08:47:57 jmc Exp $ */ +/* $OpenBSD: confpars.c,v 1.16 2006/12/17 18:03:33 stevesk Exp $ */ /* * Copyright (c) 1995, 1996, 1997 The Internet Software Consortium. @@ -144,7 +144,6 @@ read_leases(void) | DYNAMIC_BOOTP_LEASE_CUTOFF date | DYNAMIC_BOOTP_LEASE_LENGTH lease_time | BOOT_UNKNOWN_CLIENTS boolean - | ONE_LEASE_PER_CLIENT boolean | GET_LEASE_HOSTNAMES boolean | USE_HOST_DECL_NAME boolean | NEXT_SERVER ip-addr-or-hostname SEMI @@ -292,12 +291,6 @@ int parse_statement(cfile, group, type, host_decl, declaration) group->boot_unknown_clients = parse_boolean(cfile); break; - case TOK_ONE_LEASE_PER_CLIENT: - if (type == HOST_DECL) - parse_warn("one-lease-per-client not allowed here."); - group->one_lease_per_client = parse_boolean(cfile); - break; - case TOK_GET_LEASE_HOSTNAMES: if (type == HOST_DECL) parse_warn("get-lease-hostnames not allowed here."); @@ -746,8 +739,6 @@ void parse_subnet_declaration(cfile, share) shared_network containing it. */ if (subnet->group->dynamic_bootp) share->group->dynamic_bootp = 1; - if (subnet->group->one_lease_per_client) - share->group->one_lease_per_client = 1; /* Add the subnet to the list of subnets in this shared net. */ if (!share->subnets) diff --git a/usr.sbin/dhcpd/dhcpd.h b/usr.sbin/dhcpd/dhcpd.h index c3d8715ec8a..6261d4118b8 100644 --- a/usr.sbin/dhcpd/dhcpd.h +++ b/usr.sbin/dhcpd/dhcpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhcpd.h,v 1.27 2006/12/12 19:32:21 stevesk Exp $ */ +/* $OpenBSD: dhcpd.h,v 1.28 2006/12/17 18:03:33 stevesk Exp $ */ /* * Copyright (c) 1995, 1996, 1997, 1998, 1999 @@ -246,7 +246,6 @@ struct group { int dynamic_bootp; int allow_bootp; int allow_booting; - int one_lease_per_client; int get_lease_hostnames; int use_host_decl_names; int use_lease_addr_for_default_route; diff --git a/usr.sbin/dhcpd/dhctoken.h b/usr.sbin/dhcpd/dhctoken.h index bfe38d96b88..8a52e5f5393 100644 --- a/usr.sbin/dhcpd/dhctoken.h +++ b/usr.sbin/dhcpd/dhctoken.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dhctoken.h,v 1.3 2006/04/18 19:18:32 deraadt Exp $ */ +/* $OpenBSD: dhctoken.h,v 1.4 2006/12/17 18:03:33 stevesk Exp $ */ /* Tokens for config file lexer and parser. */ @@ -74,7 +74,6 @@ #define TOK_NEXT_SERVER 291 #define TOK_TOKEN_RING 292 #define TOK_GROUP 293 -#define TOK_ONE_LEASE_PER_CLIENT 294 #define TOK_GET_LEASE_HOSTNAMES 295 #define TOK_USE_HOST_DECL_NAMES 296 #define TOK_SEND 297 |