[src/netbsd-1-5]: src/usr.sbin/dhcp pull up difference between 1.1.1.3 and 1....

[mellon <mellon%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6801ae43037e
branches:  netbsd-1-5
changeset: 488646:6801ae43037e
user:      mellon <mellon%NetBSD.org@localhost>
date:      Sat Jul 22 05:05:17 2000 +0000

description:
pull up difference between 1.1.1.3 and 1.1.1.4

diffstat:

 usr.sbin/dhcp/includes/minires/minires.h |  16 ++++++++--------
 usr.sbin/dhcp/minires/res_findzonecut.c  |  19 ++++++++++---------
 usr.sbin/dhcp/minires/res_update.c       |   5 +++--
 3 files changed, 21 insertions(+), 19 deletions(-)

diffs (142 lines):

diff -r 4e233579979c -r 6801ae43037e usr.sbin/dhcp/includes/minires/minires.h
--- a/usr.sbin/dhcp/includes/minires/minires.h  Sat Jul 22 05:05:08 2000 +0000
+++ b/usr.sbin/dhcp/includes/minires/minires.h  Sat Jul 22 05:05:17 2000 +0000
@@ -31,7 +31,7 @@
 ns_updrec *minires_mkupdrec (int, const char *, unsigned int,
                             unsigned int, unsigned long);
 void minires_freeupdrec (ns_updrec *);
-int minires_nmkupdate (res_state, ns_updrec *, unsigned char *, unsigned *);
+int minires_nmkupdate (res_state, ns_updrec *, double *, unsigned *);
 ns_rcode minires_nupdate (res_state, ns_updrec *);
 int minires_ninit (res_state);
 
@@ -121,9 +121,9 @@
 ns_rcode res_findzonecut (res_state, const char *, ns_class, int, char *,
                          size_t, struct in_addr *, int, int *, void *);
 int res_nsend (res_state,
-              unsigned char *, unsigned, unsigned char *, unsigned);
-int res_nsendsigned (res_state, unsigned char *,
-                    unsigned, ns_tsig_key *, unsigned char *, unsigned);
+              double *, unsigned, double *, unsigned);
+int res_nsendsigned (res_state, double *,
+                    unsigned, ns_tsig_key *, double *, unsigned);
 int ns_samename (const char *, const char *);
 int res_nameinquery (const char *, int, int,
                     const unsigned char *, const unsigned char *);
@@ -147,15 +147,15 @@
                            const u_char *, char *, size_t);
 int res_nmkquery (res_state, int,
                  const char *, ns_class, ns_type, const unsigned char *,
-                 unsigned, const unsigned char *, unsigned char *, unsigned);
+                 unsigned, const unsigned char *, double *, unsigned);
 int ns_initparse (const unsigned char *, unsigned, ns_msg *);
 int res_nquery(res_state, const char *,
-              ns_class, ns_type, unsigned char *, unsigned anslen);
+              ns_class, ns_type, double *, unsigned anslen);
 int res_nsearch(res_state, const char *,
-               ns_class, ns_type, unsigned char *, unsigned);
+               ns_class, ns_type, double *, unsigned);
 const char *res_hostalias (const res_state, const char *, char *, size_t);
 int res_nquerydomain(res_state, const char *, const char *,
-                    ns_class class, ns_type type, unsigned char *, unsigned);
+                    ns_class class, ns_type type, double *, unsigned);
 
 int ns_skiprr(const unsigned char *, const unsigned char *, ns_sect, int);
 int dn_skipname (const unsigned char *, const unsigned char *);
diff -r 4e233579979c -r 6801ae43037e usr.sbin/dhcp/minires/res_findzonecut.c
--- a/usr.sbin/dhcp/minires/res_findzonecut.c   Sat Jul 22 05:05:08 2000 +0000
+++ b/usr.sbin/dhcp/minires/res_findzonecut.c   Sat Jul 22 05:05:17 2000 +0000
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_findzonecut.c,v 1.1.1.2.2.1 2000/07/10 19:58:51 mellon Exp $";
+static const char rcsid[] = "$Id: res_findzonecut.c,v 1.1.1.2.2.2 2000/07/22 05:05:31 mellon Exp $";
 #endif /* not lint */
 
 /*
@@ -74,7 +74,7 @@
 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,
-                        u_char *, ns_msg *, int *);
+                        double *, ns_msg *, int *);
 
 /* Public. */
 
@@ -237,7 +237,7 @@
        rrset_ns *nsrrsp)
 {
        char tname[NS_MAXDNAME];
-       u_char resp[NS_PACKETSZ];
+       double resp[NS_PACKETSZ / sizeof (double)];
        int n, i, ancount, nscount;
        ns_sect sect;
        ns_msg msg;
@@ -328,7 +328,8 @@
                        strcpy(zname, t);
                        rdata = ns_rr_rdata(rr);
                        rdlen = ns_rr_rdlen(rr);
-                       if (ns_name_uncompress(resp, ns_msg_end(msg), rdata,
+                       if (ns_name_uncompress((u_char *)resp,
+                                              ns_msg_end(msg), rdata,
                                               mname, msize) < 0) {
                                DPRINTF(("get_soa: ns_name_uncompress failed"));
                                return ns_r_servfail;
@@ -362,7 +363,7 @@
 
 static int
 get_ns(res_state statp, const char *zname, ns_class class, rrset_ns *nsrrsp) {
-       u_char resp[NS_PACKETSZ];
+       double resp[NS_PACKETSZ / sizeof (double)];
        ns_msg msg;
        int n;
        ns_rcode rcode;
@@ -391,7 +392,7 @@
 
        /* Go and get the A RRs for each empty NS RR on our list. */
        for (nsrr = ISC_LIST_HEAD(*nsrrsp); nsrr != NULL; nsrr = nsrr_n) {
-               u_char resp[NS_PACKETSZ];
+               double resp[NS_PACKETSZ / sizeof (double)];
                ns_msg msg;
                int n;
                ns_rcode rcode;
@@ -552,9 +553,9 @@
 
 static ns_rcode
 do_query(res_state statp, const char *dname, ns_class class, ns_type qtype,
-        u_char *resp, ns_msg *msg, int *alias_count)
+        double *resp, ns_msg *msg, int *alias_count)
 {
-       u_char req[NS_PACKETSZ];
+       double req[NS_PACKETSZ / sizeof (double)];
        int i;
        unsigned n;
 
@@ -574,7 +575,7 @@
                errno = EMSGSIZE;
                return ns_r_servfail;
        }
-       if (ns_initparse(resp, n, msg) < 0) {
+       if (ns_initparse((u_char *)resp, n, msg) < 0) {
                DPRINTF(("do_query: ns_initparse failed"));
                return ns_r_servfail;
        }
diff -r 4e233579979c -r 6801ae43037e usr.sbin/dhcp/minires/res_update.c
--- a/usr.sbin/dhcp/minires/res_update.c        Sat Jul 22 05:05:08 2000 +0000
+++ b/usr.sbin/dhcp/minires/res_update.c        Sat Jul 22 05:05:17 2000 +0000
@@ -1,5 +1,5 @@
 #if !defined(lint) && !defined(SABER)
-static const char rcsid[] = "$Id: res_update.c,v 1.1.1.2.2.1 2000/07/10 19:58:51 mellon Exp $";
+static const char rcsid[] = "$Id: res_update.c,v 1.1.1.2.2.2 2000/07/22 05:05:46 mellon Exp $";
 #endif /* not lint */
 
 /*
@@ -80,7 +80,8 @@
 ns_rcode
 res_nupdate(res_state statp, ns_updrec *rrecp_in) {
        ns_updrec *rrecp;
-       u_char answer[PACKETSZ], packet[2*PACKETSZ];
+       double answer[PACKETSZ / sizeof (double)];
+       double packet[2*PACKETSZ / sizeof (double)];
        struct zonegrp *zptr, tgrp;
        int nzones = 0, nscount = 0;
        unsigned n;