BSD 4_3_Net_2 release

[unix-history] / usr / src / usr.sbin / named / tools / nslookup / debug.c

diff --git a/usr/src/usr.sbin/named/tools/nslookup/debug.c b/usr/src/usr.sbin/named/tools/nslookup/debug.c
index d397c6d..cca320a 100644 (file)
--- a/usr/src/usr.sbin/named/tools/nslookup/debug.c
+++ b/usr/src/usr.sbin/named/tools/nslookup/debug.c
@@ -2,23 +2,37 @@
  * Copyright (c) 1985,1989 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1985,1989 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * Neither the name of the University nor the names of its contributors may
- * be used to endorse or promote products derived from this software without
- * specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)debug.c    5.22 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)debug.c    5.26 (Berkeley) 3/21/91";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -33,13 +47,13 @@ static char sccsid[] = "@(#)debug.c 5.22 (Berkeley) 6/29/90";
  *******************************************************************************
  */
 
  *******************************************************************************
  */
 

-#include <sys/types.h>
+#include <sys/param.h>

 #include <netinet/in.h>
 #include <netinet/in.h>

-#include <stdio.h>

 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <resolv.h>
 #include <netdb.h>
 #include <arpa/nameser.h>
 #include <arpa/inet.h>
 #include <resolv.h>
 #include <netdb.h>

+#include <stdio.h>

 #include "res.h"
 
 extern char ctime();
 #include "res.h"
 
 extern char ctime();


@@ -172,12 +186,12 @@ Fprint_query(msg, eom, printHeader,file)
 
 char *
 Print_cdname_sub(cp, msg, eom, file, format)
 
 char *
 Print_cdname_sub(cp, msg, eom, file, format)

-       char *cp, *msg, *eom;
+       u_char *cp, *msg, *eom;

        FILE *file;
        int format;
 {
        int n;
        FILE *file;
        int format;
 {
        int n;

-       char name[MAXDNAME];
+       u_char name[MAXDNAME];

        extern char *strcpy();
 
        if ((n = dn_expand(msg, eom, cp, name, sizeof(name))) < 0)
        extern char *strcpy();
 
        if ((n = dn_expand(msg, eom, cp, name, sizeof(name))) < 0)


@@ -188,9 +202,9 @@ Print_cdname_sub(cp, msg, eom, file, format)
        if (format) {
            fprintf(file, "%-30s", name);
        } else {
        if (format) {
            fprintf(file, "%-30s", name);
        } else {

-           fputs(name, file);
+           fputs((char *)name, file);

        }
        }

-       return (cp + n);
+       return ((char *)cp + n);

 }
 
 char *
 }
 
 char *


@@ -338,7 +352,8 @@ doname:
                fprintf(file,"\n\texpire  = %lu (%s)", ttl, p_time(ttl));
                cp += sizeof(u_long);
                ttl = _getlong(cp);
                fprintf(file,"\n\texpire  = %lu (%s)", ttl, p_time(ttl));
                cp += sizeof(u_long);
                ttl = _getlong(cp);

-               fprintf(file,"\n\tminimum ttl = %lu (%s)\n", ttl, p_time(ttl));
+               fprintf(file,
+                   "\n\tminimum ttl = %lu (%s)\n", ttl, p_time(ttl));

                cp += sizeof(u_long);
                break;
 
                cp += sizeof(u_long);
                break;
 


@@ -410,7 +425,8 @@ doname:
                                struct servent *s;
 
                                if (c & 0200) {
                                struct servent *s;
 
                                if (c & 0200) {

-                                       s = getservbyport(n, NULL);
+                                       s = getservbyport((int)htons(n),
+                                           protoPtr ? protoPtr->p_name : NULL);

                                        if (s != NULL) {
                                            fprintf(file,"  %s", s->s_name);
                                        } else {
                                        if (s != NULL) {
                                            fprintf(file,"  %s", s->s_name);
                                        } else {