1 files changed, 24 insertions, 22 deletions

diff --git a/src/lib/libc/net/res_mkquery.c b/src/lib/libc/net/res_mkquery.c
index 25f025e147..1f04c96272 100644
--- a/src/lib/libc/net/res_mkquery.c
+++ b/src/lib/libc/net/res_mkquery.c
@@ -1,4 +1,4 @@
-/*      $NetBSD: res_mkquery.c,v 1.5 1995/02/25 06:20:58 cgd Exp $      */
+/*      $NetBSD: res_mkquery.c,v 1.6 1996/02/02 15:22:32 mrg Exp $      */
 
 /*-
  * Copyright (c) 1985, 1993
@@ -56,9 +56,9 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 #if 0
 static char sccsid[] = "@(#)res_mkquery.c       8.1 (Berkeley) 6/4/93";
-static char rcsid[] = "$Id: res_mkquery.c,v 4.9.1.2 1993/05/17 10:00:01 vixie Exp ";
+static char rcsid[] = "$Id: res_mkquery.c,v 8.3 1995/06/29 09:26:28 vixie Exp ";
 #else
-static char rcsid[] = "$NetBSD: res_mkquery.c,v 1.5 1995/02/25 06:20:58 cgd Exp $";
+static char rcsid[] = "$NetBSD: res_mkquery.c,v 1.6 1996/02/02 15:22:32 mrg Exp $";
 #endif
 #endif /* LIBC_SCCS and not lint */
 
@@ -73,21 +73,22 @@ static char rcsid[] = "$NetBSD: res_mkquery.c,v 1.5 1995/02/25 06:20:58 cgd Exp
  * Form all types of queries.
  * Returns the size of the result or -1.
  */
+int
 res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
         int op;                 /* opcode of query */
         const char *dname;              /* domain name */
         int class, type;        /* class and type of query */
-        const char *data;               /* resource record data */
+        const u_char *data;             /* resource record data */
         int datalen;            /* length of data */
-        const char *newrr_in;   /* new rr for modify or append */
-        char *buf;              /* buffer to put query */
+        const u_char *newrr_in; /* new rr for modify or append */
+        u_char *buf;            /* buffer to put query */
         int buflen;             /* size of buffer */
 {
         register HEADER *hp;
-        register char *cp;
+        register u_char *cp;
         register int n;
         struct rrec *newrr = (struct rrec *) newrr_in;
-        char *dnptrs[10], **dpp, **lastdnptr;
+        u_char *dnptrs[10], **dpp, **lastdnptr;
 
 #ifdef DEBUG
         if (_res.options & RES_DEBUG)
@@ -117,16 +118,16 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
          */
         switch (op) {
         case QUERY:
+        case NS_NOTIFY_OP:
                 if ((buflen -= QFIXEDSZ) < 0)
                         return(-1);
-                if ((n = dn_comp((u_char *)dname, (u_char *)cp, buflen,
-                    (u_char **)dnptrs, (u_char **)lastdnptr)) < 0)
+                if ((n = dn_comp(dname, cp, buflen, dnptrs, lastdnptr)) < 0)
                         return (-1);
                 cp += n;
                 buflen -= n;
-                __putshort(type, (u_char *)cp);
+                __putshort(type, cp);
                 cp += sizeof(u_int16_t);
-                __putshort(class, (u_char *)cp);
+                __putshort(class, cp);
                 cp += sizeof(u_int16_t);
                 hp->qdcount = htons(1);
                 if (op == QUERY || data == NULL)
@@ -135,18 +136,17 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
                  * Make an additional record for completion domain.
                  */
                 buflen -= RRFIXEDSZ;
-                if ((n = dn_comp((u_char *)data, (u_char *)cp, buflen,
-                    (u_char **)dnptrs, (u_char **)lastdnptr)) < 0)
+                if ((n = dn_comp(data, cp, buflen, dnptrs, lastdnptr)) < 0)
                         return (-1);
                 cp += n;
                 buflen -= n;
-                __putshort(T_NULL, (u_char *)cp);
+                __putshort(T_NULL, cp);
                 cp += sizeof(u_int16_t);
-                __putshort(class, (u_char *)cp);
+                __putshort(class, cp);
                 cp += sizeof(u_int16_t);
-                __putlong(0, (u_char *)cp);
+                __putlong(0, cp);
                 cp += sizeof(u_int32_t);
-                __putshort(0, (u_char *)cp);
+                __putshort(0, cp);
                 cp += sizeof(u_int16_t);
                 hp->arcount = htons(1);
                 break;
@@ -158,13 +158,13 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
                 if (buflen < 1 + RRFIXEDSZ + datalen)
                         return (-1);
                 *cp++ = '\0';   /* no domain name */
-                __putshort(type, (u_char *)cp);
+                __putshort(type, cp);
                 cp += sizeof(u_int16_t);
-                __putshort(class, (u_char *)cp);
+                __putshort(class, cp);
                 cp += sizeof(u_int16_t);
-                __putlong(0, (u_char *)cp);
+                __putlong(0, cp);
                 cp += sizeof(u_int32_t);
-                __putshort(datalen, (u_char *)cp);
+                __putshort(datalen, cp);
                 cp += sizeof(u_int16_t);
                 if (datalen) {
                         bcopy(data, cp, datalen);
@@ -231,6 +231,8 @@ res_mkquery(op, dname, class, type, data, datalen, newrr_in, buf, buflen)
                 break;
 
 #endif /* ALLOW_UPDATES */
+        default:
+                return (-1);
         }
         return (cp - buf);
 }