mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-31 14:25:41 +00:00
Code Issues Releases Wiki Activity

- A new DDNS related server option, update-conflict-detection, has been

Browse Source 
added.  If this option is enabled, dhcpd will perform normal DHCID
  conflict resolution (the default).  If this option is disabled, it will
  instead trust the assigned name implicitly (removing any other bindings
  on that name).  This option has not been made available in dhclient.
  [ISC-Bugs #16165]
This commit is contained in:
David Hankins
2006-07-19 17:14:55 +00:00
parent e77c575fc4
commit 3004bebf47
7 changed files with 86 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
common/dns.c
View File

@@ -33,7 +33,7 @@
#ifndef lint
static char copyright[] =
"$Id: dns.c,v 1.39 2006/06/01 20:23:17 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
"$Id: dns.c,v 1.40 2006/07/19 17:14:55 dhankins Exp $ Copyright (c) 2004-2006 Internet Systems Consortium. All rights reserved.\n";
#endif /* not lint */
#include "dhcpd.h"
@@ -518,10 +518,10 @@ int get_dhcid (struct data_string *id,
/* Now for the DDNS update code that is shared between client and
server... */
isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
struct iaddr ddns_addr,
struct data_string *ddns_dhcid,
unsigned long ttl, int rrsetp)
isc_result_t
ddns_update_a(struct data_string *ddns_fwd_name, struct iaddr ddns_addr,
struct data_string *ddns_dhcid, unsigned long ttl,
unsigned rrsetp, unsigned conflict)
{
ns_updque updqueue;
ns_updrec *updrec;
@@ -654,23 +654,45 @@ isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
minires_freeupdrec (updrec);
}
/*
* DHCID RR exists, and matches client identity.
/* If we're doing conflict resolution, we use a set of prereqs. If
* not, we delete the DHCID in addition to all A rrsets.
*/
updrec = minires_mkupdrec (S_PREREQ,
(const char *)ddns_fwd_name -> data,
C_IN, T_DHCID, 0);
if (!updrec) {
result = ISC_R_NOMEMORY;
goto error;
if (conflict) {
/*
* DHCID RR exists, and matches client identity.
*/
updrec = minires_mkupdrec (S_PREREQ,
(const char *)ddns_fwd_name -> data,
C_IN, T_DHCID, 0);
if (!updrec) {
result = ISC_R_NOMEMORY;
goto error;
}
updrec -> r_data = ddns_dhcid -> data;
updrec -> r_size = ddns_dhcid -> len;
updrec -> r_opcode = YXRRSET;
ISC_LIST_APPEND (updqueue, updrec, r_link);
} else {
/*
* Conflict detection override: delete DHCID RRs.
*/
updrec = minires_mkupdrec(S_UPDATE, ddns_fwd_name->data,
C_IN, T_DHCID, 0);
if (!updrec) {
result = ISC_R_NOMEMORY;
goto error;
}
updrec->r_data = NULL;
updrec->r_size = 0;
updrec->r_opcode = DELETE;
ISC_LIST_APPEND(updqueue, updrec, r_link);
}
updrec -> r_data = ddns_dhcid -> data;
updrec -> r_size = ddns_dhcid -> len;
updrec -> r_opcode = YXRRSET;
ISC_LIST_APPEND (updqueue, updrec, r_link);
/*
* Delete A RRset.