diff options
Diffstat (limited to 'minires')
| -rw-r--r-- | minires/ns_sign.c | 4 | ||||
| -rw-r--r-- | minires/ns_verify.c | 4 | ||||
| -rw-r--r-- | minires/res_findzonecut.c | 4 | ||||
| -rw-r--r-- | minires/res_init.c | 8 | ||||
| -rw-r--r-- | minires/res_sendsigned.c | 4 | ||||
| -rw-r--r-- | minires/res_update.c | 15 |
6 files changed, 20 insertions, 19 deletions
diff --git a/minires/ns_sign.c b/minires/ns_sign.c index f1d603d1..1137302a 100644 --- a/minires/ns_sign.c +++ b/minires/ns_sign.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id: ns_sign.c,v 1.4 2001/02/15 14:10:58 mellon Exp $"; +static const char rcsid[] = "$Id: ns_sign.c,v 1.5 2001/06/27 00:30:32 mellon Exp $"; #endif #if defined (TRACING) @@ -44,7 +44,7 @@ time_t trace_mr_time (time_t *); #include "minires/minires.h" #include "arpa/nameser.h" -#include <isc/dst.h> +#include <isc-dhcp/dst.h> #define BOUNDS_CHECK(ptr, count) \ do { \ diff --git a/minires/ns_verify.c b/minires/ns_verify.c index ce11e873..4ebca7cf 100644 --- a/minires/ns_verify.c +++ b/minires/ns_verify.c @@ -16,7 +16,7 @@ */ #ifndef lint -static const char rcsid[] = "$Id: ns_verify.c,v 1.5 2001/02/22 07:28:22 mellon Exp $"; +static const char rcsid[] = "$Id: ns_verify.c,v 1.6 2001/06/27 00:30:33 mellon Exp $"; #endif #define time(x) trace_mr_time (x) @@ -40,7 +40,7 @@ static const char rcsid[] = "$Id: ns_verify.c,v 1.5 2001/02/22 07:28:22 mellon E #include "minires/minires.h" #include "arpa/nameser.h" -#include <isc/dst.h> +#include <isc-dhcp/dst.h> time_t trace_mr_time (time_t *); diff --git a/minires/res_findzonecut.c b/minires/res_findzonecut.c index 4d6bff29..35d47d87 100644 --- a/minires/res_findzonecut.c +++ b/minires/res_findzonecut.c @@ -1,5 +1,5 @@ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: res_findzonecut.c,v 1.14 2001/04/27 20:01:29 mellon Exp $"; +static const char rcsid[] = "$Id: res_findzonecut.c,v 1.15 2001/06/27 00:30:34 mellon Exp $"; #endif /* not lint */ /* @@ -36,7 +36,7 @@ static const char rcsid[] = "$Id: res_findzonecut.c,v 1.14 2001/04/27 20:01:29 m #include <stdlib.h> #include <string.h> -#include <isc/list.h> +#include <isc-dhcp/list.h> #include "minires/minires.h" #include "arpa/nameser.h" diff --git a/minires/res_init.c b/minires/res_init.c index 512cdfed..cfdbb596 100644 --- a/minires/res_init.c +++ b/minires/res_init.c @@ -70,7 +70,7 @@ #if defined(LIBC_SCCS) && !defined(lint) static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93"; -static const char rcsid[] = "$Id: res_init.c,v 1.4 2001/02/22 07:28:23 mellon Exp $"; +static const char rcsid[] = "$Id: res_init.c,v 1.5 2001/06/27 00:30:35 mellon Exp $"; #endif /* LIBC_SCCS and not lint */ #include <sys/types.h> @@ -132,7 +132,7 @@ static u_int32_t net_mask (struct in_addr); * * Return 0 if completes successfully, -1 on error */ -extern int __res_vinit(res_state, int); +extern int minires_vinit(res_state, int); #if defined (TRACING) u_int trace_mr_res_randomid(u_int); @@ -141,12 +141,12 @@ u_int trace_mr_res_randomid(u_int); int res_ninit(res_state statp) { - return (__res_vinit(statp, 0)); + return (minires_vinit(statp, 0)); } /* This function has to be reachable by res_data.c but not publically. */ int -__res_vinit(res_state statp, int preinit) { +minires_vinit(res_state statp, int preinit) { register FILE *fp; register char *cp, **pp; register int n; diff --git a/minires/res_sendsigned.c b/minires/res_sendsigned.c index 3ed456d0..be213afe 100644 --- a/minires/res_sendsigned.c +++ b/minires/res_sendsigned.c @@ -15,7 +15,7 @@ #include "minires/minires.h" #include "arpa/nameser.h" -#include <isc/dst.h> +#include <isc-dhcp/dst.h> /* res_nsendsigned */ isc_result_t @@ -59,7 +59,7 @@ res_nsendsigned(res_state statp, if (dstkey == NULL) { free(nstatp); free(newmsg); - return ISC_R_INVALIDARG; + return ISC_R_BADKEY; } nstatp->nscount = 1; diff --git a/minires/res_update.c b/minires/res_update.c index ffc384ab..4e2a8ec1 100644 --- a/minires/res_update.c +++ b/minires/res_update.c @@ -1,5 +1,5 @@ #if !defined(lint) && !defined(SABER) -static const char rcsid[] = "$Id: res_update.c,v 1.11 2001/01/17 08:22:20 mellon Exp $"; +static const char rcsid[] = "$Id: res_update.c,v 1.12 2001/06/27 00:30:38 mellon Exp $"; #endif /* not lint */ /* @@ -39,7 +39,7 @@ static const char rcsid[] = "$Id: res_update.c,v 1.11 2001/01/17 08:22:20 mellon #include <stdlib.h> #include <string.h> -#include <isc/list.h> +#include <isc-dhcp/list.h> #include "minires/minires.h" #include "arpa/nameser.h" @@ -134,7 +134,7 @@ res_nupdate(res_state statp, ns_updrec *rrecp_in) { rrecp = res_mkupdrec(ns_s_zn, zptr->z_origin, zptr->z_class, ns_t_soa, 0); if (rrecp == NULL) { - rcode = -1; /* XXX */ + rcode = ISC_R_UNEXPECTED; goto done; } ISC_LIST_PREPEND(zptr->z_rrlist, rrecp, r_glink); @@ -154,17 +154,18 @@ res_nupdate(res_state statp, ns_updrec *rrecp_in) { /* Send the update and remember the result. */ key = (ns_tsig_key *)0; - if (!find_tsig_key (&key, zptr->z_origin, zcookie)) { + rcode = find_tsig_key (&key, zptr->z_origin, zcookie); + if (rcode == ISC_R_SUCCESS) { rcode = res_nsendsigned(statp, packet, n, key, answer, sizeof answer, &rval); tkey_free (&key); - } else { + } else if (rcode == ISC_R_NOTFOUND || rcode == ISC_R_KEY_UNKNOWN) { rcode = res_nsend(statp, packet, n, answer, sizeof answer, &rval); } - if (rcode != ISC_R_SUCCESS) { + if (rcode != ISC_R_SUCCESS) goto undone; - } + rcode = ns_rcode_to_isc (((HEADER *)answer)->rcode); if (zcookie && rcode == ISC_R_BADSIG) { repudiate_zone (&zcookie); |