mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-09-01 14:55:30 +00:00
Code Issues Releases Wiki Activity

Update some obsolete declarations.

Browse Source
This commit is contained in:
Ted Lemon
2001-01-25 21:55:54 +00:00
parent 1ecf93b561
commit 5b77c9109e
1 changed files with 11 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/ddns.c
View File

@@ -43,7 +43,7 @@
#ifndef lint #ifndef lint
static char copyright[] = static char copyright[] =
"$Id: ddns.c,v 1.12 2001/01/25 08:29:12 mellon Exp $ Copyright (c) 2000-2001 The Internet Software Consortium. All rights reserved.\n"; "$Id: ddns.c,v 1.13 2001/01/25 21:55:54 mellon Exp $ Copyright (c) 2000-2001 The Internet Software Consortium. All rights reserved.\n";
#endif /* not lint */ #endif /* not lint */
#include "dhcpd.h" #include "dhcpd.h"
@@ -259,13 +259,6 @@ static isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
print_dns_status ((int)result, &updqueue); print_dns_status ((int)result, &updqueue);
while (!ISC_LIST_EMPTY (updqueue)) {
updrec = ISC_LIST_HEAD (updqueue);
ISC_LIST_UNLINK (updqueue, updrec, r_link);
minires_freeupdrec (updrec);
}
/* /*
* If this query succeeds, the updater can conclude that the current * If this query succeeds, the updater can conclude that the current
* client was the last client associated with the domain name, and that * client was the last client associated with the domain name, and that
@@ -275,10 +268,6 @@ static isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
* -- "Interaction between DHCP and DNS" * -- "Interaction between DHCP and DNS"
*/ */
if (result == ISC_R_SUCCESS)
return result;
/* /*
* If the second query fails with NXRRSET, the updater must conclude * If the second query fails with NXRRSET, the updater must conclude
* that the client's desired name is in use by another host. At this * that the client's desired name is in use by another host. At this
@@ -294,9 +283,6 @@ static isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
* -- "Interaction between DHCP and DNS" * -- "Interaction between DHCP and DNS"
*/ */
return result;
error: error:
while (!ISC_LIST_EMPTY (updqueue)) { while (!ISC_LIST_EMPTY (updqueue)) {
updrec = ISC_LIST_HEAD (updqueue); updrec = ISC_LIST_HEAD (updqueue);
@@ -304,17 +290,17 @@ static isc_result_t ddns_update_a (struct data_string *ddns_fwd_name,
minires_freeupdrec (updrec); minires_freeupdrec (updrec);
} }
return SERVFAIL; return result;
} }
static ns_rcode ddns_update_ptr (struct data_string *ddns_fwd_name, static isc_result_t ddns_update_ptr (struct data_string *ddns_fwd_name,
struct data_string *ddns_rev_name, struct data_string *ddns_rev_name,
unsigned long ttl) unsigned long ttl)
{ {
ns_updque updqueue; ns_updque updqueue;
ns_updrec *updrec; ns_updrec *updrec;
ns_rcode result = SERVFAIL; ns_rcode result = ISC_R_UNEXPECTED;
/* /*
* The DHCP server submits a DNS query which deletes all of the PTR RRs * The DHCP server submits a DNS query which deletes all of the PTR RRs
@@ -379,9 +365,9 @@ static ns_rcode ddns_update_ptr (struct data_string *ddns_fwd_name,
} }
static ns_rcode ddns_remove_a (struct data_string *ddns_fwd_name, static isc_result_t ddns_remove_a (struct data_string *ddns_fwd_name,
struct iaddr ddns_addr, struct iaddr ddns_addr,
struct data_string *ddns_dhcid) struct data_string *ddns_dhcid)
{ {
ns_updque updqueue; ns_updque updqueue;
ns_updrec *updrec; ns_updrec *updrec;
@@ -389,7 +375,7 @@ static ns_rcode ddns_remove_a (struct data_string *ddns_fwd_name,
char ddns_address [16]; char ddns_address [16];
if (ddns_addr.len != 4) if (ddns_addr.len != 4)
return SERVFAIL; return ISC_R_INVALIDARG;
#ifndef NO_SNPRINTF #ifndef NO_SNPRINTF
snprintf (ddns_address, 16, "%d.%d.%d.%d", snprintf (ddns_address, 16, "%d.%d.%d.%d",
@@ -559,7 +545,7 @@ static ns_rcode ddns_remove_a (struct data_string *ddns_fwd_name,
} }
static ns_rcode ddns_remove_ptr (struct data_string *ddns_rev_name) static isc_result_t ddns_remove_ptr (struct data_string *ddns_rev_name)
{ {
ns_updque updqueue; ns_updque updqueue;
ns_updrec *updrec; ns_updrec *updrec;