mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-02 07:15:44 +00:00
Code Issues Releases Wiki Activity

Support auth-key and key statements.

Browse Source
This commit is contained in:
Ted Lemon
2000-04-06 22:31:16 +00:00
parent 026975bbab
commit 6247476e9a
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/clparse.c
View File

@@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: clparse.c,v 1.42 2000/03/17 03:58:55 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n"; "$Id: clparse.c,v 1.43 2000/04/06 22:31:16 mellon Exp $ Copyright (c) 1996-2000 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -206,7 +206,7 @@ void read_client_leases ()
interface-declaration | interface-declaration |
LEASE client-lease-statement | LEASE client-lease-statement |
ALIAS client-lease-statement | ALIAS client-lease-statement |
AUTH_KEY key_id key_data */ KEY key-definition */
void parse_client_statement (cfile, ip, config) void parse_client_statement (cfile, ip, config)
struct parse *cfile; struct parse *cfile;
@@ -225,7 +225,7 @@ void parse_client_statement (cfile, ip, config)
int known; int known;
switch (peek_token (&val, cfile)) { switch (peek_token (&val, cfile)) {
case AUTH_KEY: case KEY:
next_token (&val, cfile); next_token (&val, cfile);
if (ip) { if (ip) {
/* This may seem arbitrary, but there's a reason for /* This may seem arbitrary, but there's a reason for
@@ -240,13 +240,11 @@ void parse_client_statement (cfile, ip, config)
want to lull them into believing they've gotten want to lull them into believing they've gotten
their way. This is a bit contrived, but people their way. This is a bit contrived, but people
tend not to be entirely rational about security. */ tend not to be entirely rational about security. */
parse_warn (cfile, "auth-key not allowed here."); parse_warn (cfile, "key definition not allowed here.");
skip_to_semi (cfile); skip_to_semi (cfile);
break; break;
} }
memset (&key_id, 0, sizeof key_id); parse_key (cfile);
if (parse_auth_key (&key_id, cfile))
data_string_forget (&key_id, MDL);
return; return;
/* REQUIRE can either start a policy statement or a /* REQUIRE can either start a policy statement or a
@@ -880,7 +878,7 @@ void parse_client_lease_statement (cfile, is_static)
RENEW time-decl | RENEW time-decl |
REBIND time-decl | REBIND time-decl |
EXPIRE time-decl | EXPIRE time-decl |
AUTH_KEY id */ KEY id */
void parse_client_lease_declaration (cfile, lease, ipp, clientp) void parse_client_lease_declaration (cfile, lease, ipp, clientp)
struct parse *cfile; struct parse *cfile;
@@ -897,12 +895,16 @@ void parse_client_lease_declaration (cfile, lease, ipp, clientp)
struct data_string key_id; struct data_string key_id;
switch (next_token (&val, cfile)) { switch (next_token (&val, cfile)) {
case AUTH_KEY: case KEY:
memset (&key_id, 0, sizeof key_id); token = next_token (&val, cfile);
if (parse_auth_key (&key_id, cfile)) { if (token != STRING && !is_identifier (token)) {
data_string_copy (&lease -> auth_key_id, &key_id, MDL); parse_warn (cfile, "expecting key name.");
data_string_forget (&key_id, MDL); skip_to_semi (cfile);
break;
} }
if (tsig_key_lookup (&lease -> key, val) != ISC_R_SUCCESS)
parse_warn (cfile, "unknown key %s", val);
parse_semi (cfile);
break; break;
case BOOTP: case BOOTP:
lease -> is_bootp = 1; lease -> is_bootp = 1;