MASSIVE merge from V3-RELEASE-BRANCH into HEAD. HEAD and V3-RELEASE are

[thirdparty/dhcp.git] / includes / minires / minires.h

diff --git a/includes/minires/minires.h b/includes/minires/minires.h
index 2a6a1336ffcb240ef8d54fe046c5299e98a8d1ef..19d21318682a36ae3911d26d46771e930ae40ed5 100644 (file)
--- a/includes/minires/minires.h
+++ b/includes/minires/minires.h
@@ -1,23 +1,31 @@
 /*
- * Copyright (c) 2001 by Internet Software Consortium.
+ * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (c) 2001-2003 by Internet Software Consortium
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS
- * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE
- * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
- * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ *   Internet Systems Consortium, Inc.
+ *   950 Charter Street
+ *   Redwood City, CA 94063
+ *   <info@isc.org>
+ *   http://www.isc.org/
  */
 
 #include "cdefs.h"
 #include "osdep.h"
 
+#define _ns_flagdata MR_ns_flagdata
+
 #include "minires/resolv.h"
 #include "minires/res_update.h"
 #include "isc-dhcp/result.h"
@@ -151,7 +159,7 @@ isc_result_t res_nmkquery (res_state, int, const char *, ns_class, ns_type,
                           const unsigned char *, unsigned,
                           const unsigned char *, double *,
                           unsigned, unsigned *);
-int ns_initparse (const unsigned char *, unsigned, ns_msg *);
+isc_result_t ns_initparse (const unsigned char *, unsigned, ns_msg *);
 isc_result_t res_nquery(res_state, const char *,
                        ns_class, ns_type, double *, unsigned, unsigned *);
 isc_result_t res_nsearch(res_state, const char *,
@@ -161,7 +169,8 @@ isc_result_t res_nquerydomain(res_state, const char *, const char *,
                              ns_class class, ns_type type,
                              double *, unsigned, unsigned *);
 
-int ns_skiprr(const unsigned char *, const unsigned char *, ns_sect, int);
+isc_result_t ns_skiprr(const unsigned char *,
+                      const unsigned char *, ns_sect, int, int *);
 int dn_skipname (const unsigned char *, const unsigned char *);
 u_int32_t getULong (const unsigned char *);
 int32_t getLong (const unsigned char *);