From 6cff8371b50d6285cff5a2a1caabe2198b493ffe Mon Sep 17 00:00:00 2001
From: Ted Lemon <source@isc.org>
Date: Wed, 17 Jan 2001 16:56:48 +0000
Subject: [PATCH] Fix some compile problems.

---
 common/tree.c             |  6 +++++-
 minires/res_findzonecut.c |  8 ++++----
 minires/toisc.c           | 13 ++++++++++++-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/common/tree.c b/common/tree.c
index 1b391e0da..9e5ad5414 100644
--- a/common/tree.c
+++ b/common/tree.c
@@ -43,7 +43,7 @@
 
 #ifndef lint
 static char copyright[] =
-"$Id: tree.c,v 1.96 2001/01/16 23:15:38 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
+"$Id: tree.c,v 1.97 2001/01/17 16:56:42 mellon Exp $ Copyright (c) 1995-2000 The Internet Software Consortium.  All rights reserved.\n";
 #endif /* not lint */
 
 #include "dhcpd.h"
@@ -969,12 +969,16 @@ int evaluate_boolean_expression (result, packet, lease, client_state,
 			    break;
 
 			  case binding_dns:
+#if defined (NSUPDATE)
 			    /* XXX This should be a comparison for equal
 			       XXX values, not for identity. */
 			    if (bv -> value.dns == obv -> value.dns)
 				*result = expr -> op == expr_equal;
 			    else
 				*result = expr -> op == expr_not_equal;
+#else
+				*result = expr -> op == expr_not_equal;
+#endif
 			    break;
 
 			  case binding_function:
diff --git a/minires/res_findzonecut.c b/minires/res_findzonecut.c
index d56c8babd..dd49fa03e 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.11 2001/01/16 22:33:13 mellon Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.12 2001/01/17 16:56:47 mellon Exp $";
 #endif /* not lint */
 
 /*
@@ -73,8 +73,8 @@ static isc_result_t save_a(res_state, ns_msg *, ns_sect,
 static void	free_nsrrset(rrset_ns *);
 static void	free_nsrr(rrset_ns *, rr_ns *);
 static rr_ns *	find_ns(rrset_ns *, const char *);
-static ns_rcode	do_query(res_state, const char *, ns_class, ns_type,
-			 double *, ns_msg *, int *);
+static isc_result_t do_query(res_state, const char *, ns_class, ns_type,
+			     double *, ns_msg *, int *);
 
 /* Public. */
 
@@ -133,7 +133,7 @@ static ns_rcode	do_query(res_state, const char *, ns_class, ns_type,
  *	keep going.  for the NS and A queries this means we just give up.
  */
 
-ns_rcode
+isc_result_t
 res_findzonecut(res_state statp, const char *dname, ns_class class, int opts,
 		char *zname, size_t zsize, struct in_addr *addrs, int naddrs,
 		int *count, void *zcookie)
diff --git a/minires/toisc.c b/minires/toisc.c
index da78a63c4..06472c0a8 100644
--- a/minires/toisc.c
+++ b/minires/toisc.c
@@ -237,24 +237,35 @@ isc_result_t uerr2isc (int err)
 	      case EDQUOT:
 		return ISC_R_QUOTA;
 
+#ifdef EBADRPC
 	      case EBADRPC:
 		return ISC_R_NOTIMPLEMENTED;
+#endif
 
+#ifdef ERPCMISMATCH
 	      case ERPCMISMATCH:
 		return ISC_R_VERSIONMISMATCH;
+#endif
 
+#ifdef EPROGMISMATCH
 	      case EPROGMISMATCH:
 		return ISC_R_VERSIONMISMATCH;
+#endif
 
+#ifdef EAUTH
 	      case EAUTH:
 		return ISC_R_NOTAUTH;
+#endif
 
+#ifdef ENEEDAUTH
 	      case ENEEDAUTH:
 		return ISC_R_NOTAUTH;
+#endif
 
+#ifdef EOVERFLOW
 	      case EOVERFLOW:
 		return ISC_R_NOSPACE;
-
+#endif
 	}
 	return ISC_R_UNEXPECTED;
 }
-- 
2.47.2