diff options
Diffstat (limited to 'usr.sbin/named')
34 files changed, 306 insertions, 306 deletions
diff --git a/usr.sbin/named/Makefile b/usr.sbin/named/Makefile index c337c36..d569375 100644 --- a/usr.sbin/named/Makefile +++ b/usr.sbin/named/Makefile @@ -6,7 +6,7 @@ ## - ## Copyright (c) 1985, 1989 ## The Regents of the University of California. All rights reserved. -## +## ## Redistribution and use in source and binary forms, with or without ## modification, are permitted provided that the following conditions ## are met: @@ -22,7 +22,7 @@ ## 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 @@ -36,14 +36,14 @@ ## SUCH DAMAGE. ## - ## Portions Copyright (c) 1993 by Digital Equipment Corporation. -## +## ## 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, and that ## the name of Digital Equipment Corporation not be used in advertising or ## publicity pertaining to distribution of the document or software without ## specific, written prior permission. -## +## ## THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL ## WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES ## OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/db_defs.h b/usr.sbin/named/db_defs.h index db9b32c..2584276 100644 --- a/usr.sbin/named/db_defs.h +++ b/usr.sbin/named/db_defs.h @@ -1,6 +1,6 @@ /* * from db.h 4.16 (Berkeley) 6/1/90 - * $Id: db_defs.h,v 1.11 1994/07/22 08:42:39 vixie Exp $ + * $Id: db_defs.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ */ /* @@ -8,7 +8,7 @@ * - * Copyright (c) 1985, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ * 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 @@ -38,14 +38,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/db_dump.c b/usr.sbin/named/db_dump.c index 3c9b5a4..2501f2d 100644 --- a/usr.sbin/named/db_dump.c +++ b/usr.sbin/named/db_dump.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_dump.c 4.33 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $"; +static char rcsid[] = "$Id: db_dump.c,v 1.2 1994/09/22 20:45:00 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $"; * - * Copyright (c) 1986, 1988, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $"; * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_dump.c,v 1.1.1.1 1994/09/22 19:46:10 pst Exp $"; * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -259,7 +259,7 @@ doadump() } #ifdef ALLOW_UPDATES -/* Create a disk database to back up zones +/* Create a disk database to back up zones */ void zonedump(zp) @@ -554,12 +554,12 @@ db_dump(htp, fp, zone, origin) break; case T_WKS: - GETLONG(addr, cp); - addr = htonl(addr); + GETLONG(addr, cp); + addr = htonl(addr); fprintf(fp, "%s ", inet_ntoa(*(struct in_addr *)&addr)); proto = protocolname(*cp); - cp += sizeof(char); + cp += sizeof(char); fprintf(fp, "%s ", proto); i = 0; while(cp < (u_char *)dp->d_data + dp->d_size) { @@ -570,7 +570,7 @@ db_dump(htp, fp, zone, origin) servicename(i, proto)); j <<= 1; } while (++i & 07); - } + } break; case T_MINFO: @@ -702,8 +702,8 @@ static int32_t Ceor, Csum, Crot, word, bcount; #define AddToBuf(bufp, c) **bufp = c; (*bufp)++; #define times85(x) ((((((x<<2)+x)<<2)+x)<<2)+x) -/* Decode ASCII-encoded byte c into binary representation and - * place into *bufp, advancing bufp +/* Decode ASCII-encoded byte c into binary representation and + * place into *bufp, advancing bufp */ static int byte_atob(c, bufp) @@ -831,8 +831,8 @@ byte_btoa(c, bufp) } else { register int tmp = 0; register int32_t tmpword = word; - - if (tmpword < 0) { + + if (tmpword < 0) { /* Because some don't support unsigned long */ tmp = 32; tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32); diff --git a/usr.sbin/named/db_func.h b/usr.sbin/named/db_func.h index 1c7275c..4237f16 100644 --- a/usr.sbin/named/db_func.h +++ b/usr.sbin/named/db_func.h @@ -1,6 +1,6 @@ /* db_proc.h - prototypes for functions in db_*.c * - * $Id: db_func.h,v 1.8 1994/07/23 23:23:56 vixie Exp $ + * $Id: db_func.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ */ /* ++from db_update.c++ */ @@ -79,7 +79,7 @@ extern int getdtablesize __P((void)); extern struct databuf *rm_datum __P((struct databuf *, struct namebuf *, struct databuf *)); -extern struct namebuf *rm_name __P((struct namebuf *, +extern struct namebuf *rm_name __P((struct namebuf *, struct namebuf **, struct namebuf *)); #ifdef INVQ diff --git a/usr.sbin/named/db_glob.h b/usr.sbin/named/db_glob.h index 74ae45d..157e513 100644 --- a/usr.sbin/named/db_glob.h +++ b/usr.sbin/named/db_glob.h @@ -1,6 +1,6 @@ /* * from db.h 4.16 (Berkeley) 6/1/90 - * $Id: db_glob.h,v 1.2 1994/04/12 08:57:50 vixie Exp $ + * $Id: db_glob.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ */ /* @@ -8,7 +8,7 @@ * - * Copyright (c) 1985, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ * 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 @@ -38,14 +38,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/db_glue.c b/usr.sbin/named/db_glue.c index f3f3069..f061acd 100644 --- a/usr.sbin/named/db_glue.c +++ b/usr.sbin/named/db_glue.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_glue.c 4.4 (Berkeley) 6/1/90"; -static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $"; +static char rcsid[] = "$Id: db_glue.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $ * - * Copyright (c) 1986, 1988 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_glue.c,v 4.9.1.12 1994/07/22 08:42:39 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -314,7 +314,7 @@ getdtablesize() { #if defined(USE_POSIX) int j = (int) sysconf(_SC_OPEN_MAX); - + if (j >= 0) return (j); #endif /* POSIX */ diff --git a/usr.sbin/named/db_load.c b/usr.sbin/named/db_load.c index ef6d0b4..acf6ec7 100644 --- a/usr.sbin/named/db_load.c +++ b/usr.sbin/named/db_load.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_load.c 4.38 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: db_load.c,v 1.2 1994/09/22 20:45:03 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $ * - * Copyright (c) 1986, 1988, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_load.c,v 4.9.1.18 1994/07/23 23:23:56 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -271,7 +271,7 @@ db_load(filename, in_origin, zp, doinginclude) n = 0; do { if (n > (INT_MAX - (*cp - '0')) / 10) { - syslog(LOG_ERR, + syslog(LOG_ERR, "%s: line %d: number > %lu\n", filename, lineno, INT_MAX); dprintf(1, (ddt, @@ -415,7 +415,7 @@ db_load(filename, in_origin, zp, doinginclude) n = (u_int32_t) zp->z_refresh; PUTLONG(n, cp); if (zp->z_type == Z_SECONDARY -#if defined(STUBS) +#if defined(STUBS) || zp->z_type == Z_STUB #endif ) { @@ -639,7 +639,7 @@ db_load(filename, in_origin, zp, doinginclude) != OK) { #ifdef DEBUG if (debug && (c != DATAEXISTS)) - fprintf(ddt, "update failed %s %d\n", + fprintf(ddt, "update failed %s %d\n", domain, type); #endif free((char*) dp); @@ -711,9 +711,9 @@ gettoken(fp, src) return (ORIGIN); } dprintf(1, (ddt, - "%s: line %d: Unknown $ option: $%s\n", + "%s: line %d: Unknown $ option: $%s\n", src, lineno, op)); - syslog(LOG_ERR,"%s: line %d: Unknown $ option: $%s\n", + syslog(LOG_ERR,"%s: line %d: Unknown $ option: $%s\n", src, lineno, op); return (ERROR); @@ -915,11 +915,11 @@ getnum(fp, src, is_serial) seendigit = 1; } if (m > 9999) { - syslog(LOG_ERR, - "%s:%d: number after the decimal point exceeds 9999", + syslog(LOG_ERR, + "%s:%d: number after the decimal point exceeds 9999", src, lineno); dprintf(1, (ddt, - "%s:%d: number after the decimal point exceeds 9999", + "%s:%d: number after the decimal point exceeds 9999", src, lineno)); exit(1); /* XXX why exit here?? */ } @@ -1022,7 +1022,7 @@ getprotocol(fp, src) char b[MAXLEN]; (void) getword(b, sizeof(b), fp); - + k = protocolnumber(b); if(k == -1) syslog(LOG_ERR, "%s: line %d: unknown protocol: %s.", @@ -1123,7 +1123,7 @@ get_netlist(fp, netlistp, allow, print_tag) if (!inet_aton(buf, &ntp->my_addr)) { syslog(LOG_ERR, "%s contains bogus element (%s)", print_tag, buf); - continue; + continue; } if (maskp) { if (!inet_aton(maskp, &ina)) { @@ -1159,7 +1159,7 @@ get_netlist(fp, netlistp, allow, print_tag) } if (ntp) free((char *)ntp); - + dprintf(1, (ddt, "\n")); #ifdef DEBUG if (debug > 2) diff --git a/usr.sbin/named/db_lookup.c b/usr.sbin/named/db_lookup.c index 9084491..875e0ed 100644 --- a/usr.sbin/named/db_lookup.c +++ b/usr.sbin/named/db_lookup.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_lookup.c 4.18 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp $"; +static char rcsid[] = "$Id: db_lookup.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -72,7 +72,7 @@ static char rcsid[] = "$Id: db_lookup.c,v 4.9.1.5 1994/06/01 21:09:39 vixie Exp #include "named.h" -/* +/* * Lookup 'name' and return a pointer to the namebuf; * NULL otherwise. If 'insert', insert name into tables. * Wildcard lookups are handled. @@ -103,7 +103,7 @@ nlookup(name, htpp, fname, insert) return (np); if ((htp = np->n_hash) == NULL) { if (!insert) { - if (np->n_dname[0] == '*' && + if (np->n_dname[0] == '*' && np->n_dname[1] == '\0') *fname = name; return (np); diff --git a/usr.sbin/named/db_reload.c b/usr.sbin/named/db_reload.c index 1b962a6..1145e4a 100644 --- a/usr.sbin/named/db_reload.c +++ b/usr.sbin/named/db_reload.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_reload.c 4.22 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp $"; +static char rcsid[] = "$Id: db_reload.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp * - * Copyright (c) 1986, 1988 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_reload.c,v 4.9.1.4 1994/07/02 16:28:11 vixie Exp * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/db_save.c b/usr.sbin/named/db_save.c index cd1639d..abe1896 100644 --- a/usr.sbin/named/db_save.c +++ b/usr.sbin/named/db_save.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_save.c 4.16 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $"; +static char rcsid[] = "$Id: db_save.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $" * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $" * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_save.c,v 4.9.1.7 1994/07/22 08:42:39 vixie Exp $" * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -111,7 +111,7 @@ savedata(class, type, ttl, data, size) register struct databuf *dp; if (type == T_NS) - dp = (struct databuf *) + dp = (struct databuf *) #ifdef DMALLOC dmalloc(file, line, #else diff --git a/usr.sbin/named/db_secure.c b/usr.sbin/named/db_secure.c index b3eb731..d6c7bed 100644 --- a/usr.sbin/named/db_secure.c +++ b/usr.sbin/named/db_secure.c @@ -1,5 +1,5 @@ #ifndef LINT -static char rcsid[] = "$Id: db_secure.c,v 1.6 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: db_secure.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $"; #endif /* this file was contributed by Gregory Neil Shapiro of WPI in August 1993 */ @@ -91,10 +91,10 @@ build_secure_netlist(zp) "build_secure_netlist (%s): Bad address: %s\n", zp->z_origin, buf)); syslog(LOG_ERR, - "build_secure_netlist (%s): Bad address: %s", + "build_secure_netlist (%s): Bad address: %s", zp->z_origin, buf); errs++; - continue; + continue; } if (maskptr && *maskptr) { if (*maskptr == 'h' || *maskptr == 'H') { @@ -110,18 +110,18 @@ build_secure_netlist(zp) zp->z_origin, maskptr); errs++; continue; - } - } + } + } } else { ntp->mask = net_mask(ntp->my_addr); } if (ntp->my_addr.s_addr & ~(ntp->mask)) { - dprintf(1, (ddt, + dprintf(1, (ddt, "build_secure_netlist (%s): addr (%s) is not in mask (x%x)\n", zp->z_origin, inet_ntoa(ntp->my_addr), ntp->mask)); - syslog(LOG_WARNING, + syslog(LOG_WARNING, "build_secure_netlist (%s): addr (%s) is not in mask (x%x)", zp->z_origin, inet_ntoa(ntp->my_addr), @@ -133,10 +133,10 @@ build_secure_netlist(zp) /* Check for duplicates */ if (addr_on_netlist(ntp->my_addr, *netlistp)) { - dprintf(1, (ddt, + dprintf(1, (ddt, "build_secure_netlist (%s): duplicate address %s\n", zp->z_origin, inet_ntoa(ntp->my_addr))); - syslog(LOG_WARNING, + syslog(LOG_WARNING, "build_secure_netlist (%s): duplicate address %s\n", zp->z_origin, inet_ntoa(ntp->my_addr)); errs++; diff --git a/usr.sbin/named/db_update.c b/usr.sbin/named/db_update.c index 9324493..b322609 100644 --- a/usr.sbin/named/db_update.c +++ b/usr.sbin/named/db_update.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)db_update.c 4.28 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: db_update.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp * - * Copyright (c) 1986, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: db_update.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -217,7 +217,7 @@ db_update(name, odp, newdp, flags, htp) return (NONAME); /* don't let nonauthoritative updates write in authority zones */ - if (newdp && (flags & DB_NOTAUTH) && + if (newdp && (flags & DB_NOTAUTH) && (zn = findMyZone(np, newdp->d_class)) != DB_Z_CACHE) { int foundRR = 0; @@ -339,11 +339,11 @@ db_update(name, odp, newdp, flags, htp) * correctly with glue records. mpa. */ - /* if the new data is authorative + /* if the new data is authorative * remove any data for this domain with * the same class that isn't as credable */ - if (newdp->d_cred == DB_C_ZONE && + if (newdp->d_cred == DB_C_ZONE && newdp->d_cred > dp->d_cred) /* better credibility and the old datum * was not from a zone file. remove @@ -361,7 +361,7 @@ db_update(name, odp, newdp, flags, htp) /* if the new data is authoritative but * but isn't as credible, reject it. */ - if (newdp->d_cred == DB_C_ZONE && + if (newdp->d_cred == DB_C_ZONE && newdp->d_cred == dp->d_cred && newdp->d_clev < dp->d_clev) return (AUTH); @@ -400,8 +400,8 @@ db_update(name, odp, newdp, flags, htp) ntohs(from_addr.sin_port), dp->d_cred, dp->d_clev)); - if (newdp->d_cred > dp->d_cred || - (newdp->d_cred == DB_C_ZONE && + if (newdp->d_cred > dp->d_cred || + (newdp->d_cred == DB_C_ZONE && newdp->d_clev > dp->d_clev)) { /* better credibility and the old datum * was not from a zone file. remove @@ -616,7 +616,7 @@ db_cmp(dp1, dp2) cp1 += strlen((char *)cp1) + 1; cp2 += strlen((char *)cp2) + 1; return (bcmp(cp1, cp2, INT32SZ * 5)); - + case T_MX: case T_AFSDB: case T_RT: diff --git a/usr.sbin/named/dmalloc.c b/usr.sbin/named/dmalloc.c index f30dec4..6f27adf 100644 --- a/usr.sbin/named/dmalloc.c +++ b/usr.sbin/named/dmalloc.c @@ -3,7 +3,7 @@ * vix 24mar92 [added size calcs, improved printout] * vix 22mar92 [original work] * - * $Id: dmalloc.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ + * $Id: dmalloc.c,v 1.2 1994/09/22 20:45:04 pst Exp $ */ /* @@ -11,7 +11,7 @@ * - * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,7 +27,7 @@ * 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 @@ -41,14 +41,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/dmalloc.h b/usr.sbin/named/dmalloc.h index 54e68f9..6d89ab8 100644 --- a/usr.sbin/named/dmalloc.h +++ b/usr.sbin/named/dmalloc.h @@ -1,15 +1,15 @@ /* dmalloc - debugging layer on top of malloc * vix 22mar92 [written] * - * $Id: dmalloc.h,v 4.9.1.2 1993/09/08 00:01:17 vixie Exp $ + * $Id: dmalloc.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ */ /* * ++Copyright++ * - - * Copyright (c) + * Copyright (c) * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * 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 @@ -39,14 +39,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/ns_defs.h b/usr.sbin/named/ns_defs.h index bb9f18f..d9a208b 100644 --- a/usr.sbin/named/ns_defs.h +++ b/usr.sbin/named/ns_defs.h @@ -1,6 +1,6 @@ /* * from ns.h 4.33 (Berkeley) 8/23/90 - * $Id: ns_defs.h,v 1.12 1994/07/23 23:23:56 vixie Exp $ + * $Id: ns_defs.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ */ /* @@ -8,7 +8,7 @@ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ * 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 @@ -38,14 +38,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -67,7 +67,7 @@ * larger land on 32-bit boundaries; smaller structure members have been * deliberately shuffled and smaller integer sizes chosen where possible * to make sure this happens. This is all meant to avoid structure member - * padding which can cost a _lot_ of memory when you have hundreds of + * padding which can cost a _lot_ of memory when you have hundreds of * thousands of entries in your cache. */ @@ -127,7 +127,7 @@ struct zoneinfo { int z_class; /* class of zone */ #ifdef SECURE_ZONES struct netinfo *secure_nets; /* list of secure networks for zone */ -#endif +#endif }; /* zone types (z_type) */ @@ -304,11 +304,11 @@ struct nameser { #endif u_int8_t xfers; /* #/xfers running right now */ }; - + #ifdef NCACHE #define NOERROR_NODATA 6 /* only used internally by the server, used for - * -ve $ing non-existence of records. 6 is not + * -ve $ing non-existence of records. 6 is not * a code used as yet anyway. anant@isi.edu */ #define NTTL 600 /* ttl for negative data: 10 minutes? */ diff --git a/usr.sbin/named/ns_forw.c b/usr.sbin/named/ns_forw.c index 5745964..19a1cd5 100644 --- a/usr.sbin/named/ns_forw.c +++ b/usr.sbin/named/ns_forw.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_forw.c 4.32 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: ns_forw.c,v 1.1.1.1 1994/09/22 19:46:11 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -74,7 +74,7 @@ static char rcsid[] = "$Id: ns_forw.c,v 4.9.1.17 1994/07/23 23:23:56 vixie Exp $ /* * Forward the query to get the answer since its not in the database. * Returns FW_OK if a request struct is allocated and the query sent. - * Returns FW_DUP if this is a duplicate of a pending request. + * Returns FW_DUP if this is a duplicate of a pending request. * Returns FW_NOSERVER if there were no addresses for the nameservers. * Returns FW_SERVFAIL on malloc error or if asked to do something * dangerous, such as fwd to ourselves or fwd to the host that asked us. diff --git a/usr.sbin/named/ns_glob.h b/usr.sbin/named/ns_glob.h index 993d14d..4e72a48 100644 --- a/usr.sbin/named/ns_glob.h +++ b/usr.sbin/named/ns_glob.h @@ -1,6 +1,6 @@ /* * from ns.h 4.33 (Berkeley) 8/23/90 - * $Id: ns_glob.h,v 1.7 1994/06/11 22:04:46 vixie Exp $ + * $Id: ns_glob.h,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $ */ /* @@ -8,7 +8,7 @@ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ * 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 @@ -38,14 +38,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/ns_init.c b/usr.sbin/named/ns_init.c index 82c2071..af5ad93 100644 --- a/usr.sbin/named/ns_init.c +++ b/usr.sbin/named/ns_init.c @@ -8,7 +8,7 @@ static char rcsid[] = "$Id:"; * - * Copyright (c) 1986, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id:"; * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id:"; * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -315,7 +315,7 @@ boot_read(bootfile) */ if (!getword(buf, sizeof(buf), fp)) { syslog(LOG_ERR, "%s: line %d: missing %s\n", - bootfile, lineno, + bootfile, lineno, #ifdef STUBS (type == Z_SECONDARY || type == Z_STUB) #else @@ -404,7 +404,7 @@ boot_read(bootfile) */ if (zp->z_source && !strcmp(source, zp->z_source) && - !(zp->z_flags & Z_INCLUDE) && + !(zp->z_flags & Z_INCLUDE) && stat(zp->z_source, &f_time) != -1 && zp->z_ftime == f_time.st_mtime) { dprintf(1, (ddt, "cache is up to date\n")); @@ -461,7 +461,7 @@ boot_read(bootfile) */ if (zp->z_source && !strcmp(source, zp->z_source) && - !(zp->z_flags & Z_INCLUDE) && + !(zp->z_flags & Z_INCLUDE) && stat(zp->z_source, &f_time) != -1 && zp->z_ftime == f_time.st_mtime) { dprintf(1, (ddt, "zone is up to date\n")); @@ -552,8 +552,8 @@ boot_read(bootfile) zoneinit(zp); #ifdef FORCED_RELOAD else { - /* - ** Force secondary to try transfer right away + /* + ** Force secondary to try transfer right away ** after SIGHUP. */ if (reloading) { @@ -713,7 +713,7 @@ get_forwarders(fp) syslog(LOG_ERR, "'%s' (ignored, NOT dotted quad)", buf); dprintf(1, (ddt, " (ignored, NOT dotted quad)")); - continue; + continue; } #ifdef FWD_LOOP if (aIsUs(ftp->fwdaddr.sin_addr)) { @@ -737,7 +737,7 @@ get_forwarders(fp) } if (ftp) free((char *)ftp); - + #ifdef SLAVE_FORWARD /* ** Set the slave retry time to 60 seconds total divided @@ -776,7 +776,7 @@ free_forwarders() } static struct zoneinfo * -find_zone(name, type, class) +find_zone(name, type, class) char *name; int type, class; { @@ -796,7 +796,7 @@ find_zone(name, type, class) #ifdef DEBUG /* prints out the content of zones */ static void -content_zone(end) +content_zone(end) int end; { int i; diff --git a/usr.sbin/named/ns_main.c b/usr.sbin/named/ns_main.c index 8b04a49..10c294e 100644 --- a/usr.sbin/named/ns_main.c +++ b/usr.sbin/named/ns_main.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_main.c 4.55 (Berkeley) 7/1/91"; -static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: ns_main.c,v 1.1.1.1 1994/09/22 19:46:12 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $ * - * Copyright (c) 1986, 1989, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_main.c,v 4.9.1.19 1994/07/23 23:23:56 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -277,7 +277,7 @@ main(argc, argv, envp) fprintf(ddt, "Debug turned ON, Level %d\n",debug); fprintf(ddt, "Version = %s\n", Version); fprintf(ddt, "bootfile = %s\n", bootfile); - } + } #endif n = 0; @@ -325,7 +325,7 @@ main(argc, argv, envp) if ((vs = socket(AF_INET, SOCK_STREAM, 0)) < 0) { syslog(LOG_ERR, "socket(SOCK_STREAM): %m"); exit(1); - } + } if (setsockopt(vs, SOL_SOCKET, SO_REUSEADDR, (char *)&on, sizeof(on)) != 0) { @@ -593,7 +593,7 @@ main(argc, argv, envp) if (retryqp != NULL) { gettime(&tt); /* - ** The tv_sec field might be unsigned + ** The tv_sec field might be unsigned ** and thus cannot be negative. */ if ((int32_t) retryqp->q_time <= tt.tv_sec) { @@ -805,7 +805,7 @@ main(argc, argv, envp) sp->s_bufsize = sp->s_size; } } - sp->s_bufp = sp->s_buf; + sp->s_bufp = sp->s_buf; } } gettime(&tt); @@ -920,10 +920,10 @@ getnetconf() inet_ntoa(((struct sockaddr_in *) &ifreq.ifr_addr)->sin_addr))); /* build datagram queue */ - /* + /* * look for an already existing source interface address. * This happens mostly when reinitializing. Also, if - * the machine has multiple point to point interfaces, then + * the machine has multiple point to point interfaces, then * the local address may appear more than once. */ if (dqp = aIsUs(((struct sockaddr_in *)&ifreq.ifr_addr) @@ -1127,7 +1127,7 @@ opensocket(dqp) if ((dqp->dq_dfd = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { syslog(LOG_ERR, "socket(SOCK_DGRAM): %m - exiting"); exit(1); - } + } dprintf(1, (ddt, "dqp->dq_addr %s d_dfd %d\n", inet_ntoa(dqp->dq_addr), dqp->dq_dfd)); if (setsockopt(dqp->dq_dfd, SOL_SOCKET, SO_REUSEADDR, diff --git a/usr.sbin/named/ns_maint.c b/usr.sbin/named/ns_maint.c index 927fde3..12904e3 100644 --- a/usr.sbin/named/ns_maint.c +++ b/usr.sbin/named/ns_maint.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_maint.c 4.39 (Berkeley) 3/2/91"; -static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp $"; +static char rcsid[] = "$Id: ns_maint.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp * - * Copyright (c) 1986, 1988 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_maint.c,v 4.9.1.15 1994/06/11 22:04:46 vixie Exp * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -380,7 +380,7 @@ startxfer(zp) } } #endif - + if (zp->z_xaddr.s_addr != 0) { /* address was specified by the qserial logic, use it */ argv[argc++] = strcpy(argv_ns[argc_ns++], @@ -413,7 +413,7 @@ startxfer(zp) #ifdef ECHOARGS if (debug) { int i; - for (i = 0; i < argc; i++) + for (i = 0; i < argc; i++) fprintf(ddt, "Arg %d=%s\n", i, argv[i]); } #endif /* ECHOARGS */ @@ -570,7 +570,7 @@ remove_zone(htp, zone) } } } - + /* * Handle XFER limit for a nameserver. */ @@ -623,7 +623,7 @@ abortxfer(zp) SIG_FN endxfer() { - register struct zoneinfo *zp; + register struct zoneinfo *zp; int exitstatus, pid, xfers, save_errno; #if defined(sequent) union wait status; @@ -651,7 +651,7 @@ endxfer() zp->z_xferpid = 0; zp->z_flags &= ~Z_XFER_RUNNING; dprintf(1, (ddt, - "\nendxfer: child %d zone %s returned status=%d termsig=%d\n", + "\nendxfer: child %d zone %s returned status=%d termsig=%d\n", pid, zp->z_origin, exitstatus, WIFSIGNALED(status) ?WTERMSIG(status) :-1 ) @@ -724,7 +724,7 @@ tryxfer() { if (!xfers_deferred || xfers_running >= max_xfers_running) break; - + if ((xfers = nxfers(zp, 0)) != -1 && xfers < MAX_XFERS_PERNS && (zp->z_flags & Z_NEED_XFER)) { @@ -743,7 +743,7 @@ tryxfer() { void loadxfer() { - register struct zoneinfo *zp; + register struct zoneinfo *zp; gettime(&tt); for (zp = zones; zp < &zones[nzones]; zp++) { diff --git a/usr.sbin/named/ns_ncache.c b/usr.sbin/named/ns_ncache.c index 5408342..f6d1ea3 100644 --- a/usr.sbin/named/ns_ncache.c +++ b/usr.sbin/named/ns_ncache.c @@ -38,7 +38,7 @@ cache_n_resp(msg, msglen) hp = (HEADER *)msg; cp = msg+HFIXEDSZ; - + n = dn_expand(msg, msg + msglen, cp, dname, sizeof dname); if (n < 0) { dprintf(1, (ddt, "Query expand name failed:cache_n_resp\n")); diff --git a/usr.sbin/named/ns_req.c b/usr.sbin/named/ns_req.c index afc3fc5..81b2e7f 100644 --- a/usr.sbin/named/ns_req.c +++ b/usr.sbin/named/ns_req.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_req.c 4.47 (Berkeley) 7/1/91"; -static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: ns_req.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $" * - * Copyright (c) 1986, 1988, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $" * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_req.c,v 4.9.1.22 1994/07/23 23:23:56 vixie Exp $" * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -259,9 +259,9 @@ ns_req(msg, msglen, buflen, qsp, from, dfd) } dprintf(1, (ddt, "ns_req: answer -> [%s].%d fd=%d id=%d %s\n", - inet_ntoa(from->sin_addr), + inet_ntoa(from->sin_addr), ntohs(from->sin_port), - (qsp == QSTREAM_NULL) ?dfd :qsp->s_rfd, + (qsp == QSTREAM_NULL) ?dfd :qsp->s_rfd, ntohs(hp->id), local(from) == NULL ? "Remote" : "Local")); #ifdef DEBUG if (debug >= 10) @@ -409,8 +409,8 @@ req_query(hp, cpp, eom, qsp, buflenp, msglenp, msg, dfd, from) #ifdef QRYLOG if (qrylog) { syslog(LOG_INFO, "XX /%s/%s/%s", - inet_ntoa(from->sin_addr), - (dname[0] == '\0') ?"." :dname, + inet_ntoa(from->sin_addr), + (dname[0] == '\0') ?"." :dname, p_type(type)); } #endif /*QRYLOG*/ @@ -442,10 +442,10 @@ try_again: #endif /*LOCALDOM*/ #ifdef YPKLUDGE - /* Some braindamaged resolver software will not - recognize internet addresses in dot notation and - send out address queries for "names" such as - 128.93.8.1. This kludge will prevent those + /* Some braindamaged resolver software will not + recognize internet addresses in dot notation and + send out address queries for "names" such as + 128.93.8.1. This kludge will prevent those from flooding higher level servers. We simply claim to be authoritative and that the domain doesn't exist. @@ -477,7 +477,7 @@ try_again: if (zp->secure_nets && !addr_on_netlist(from->sin_addr, zp->secure_nets)) { dprintf(1, (ddt, - "REFUSED Unauthorized request from %s\n", + "REFUSED Unauthorized request from %s\n", inet_ntoa(from->sin_addr))); syslog(LOG_INFO, "Unauthorized request %s from %s", dname, inet_ntoa(from->sin_addr)); @@ -510,7 +510,7 @@ try_again: *msglenp += n; hp->rcode = NXDOMAIN; hp->nscount = htons((u_int16_t)count); - hp->aa = 1; + hp->aa = 1; return (Finish); } else @@ -567,7 +567,7 @@ try_again: "req: foundname=%d, count=%d, founddata=%d, cname=%d\n", foundname, count, founddata, cname)); - if ((lp = local(from)) != NULL) + if ((lp = local(from)) != NULL) sort_response(answers, count, lp, *cpp); if (type == T_AXFR) { hp->ancount = htons(hp->ancount); @@ -634,7 +634,7 @@ fetchns: } *cpp += n; *buflenp -= n; - hp->nscount = + hp->nscount = htons((u_int16_t) count); } @@ -719,8 +719,8 @@ fetchns: case FW_DUP: break; /* Duplicate request dropped */ case FW_NOSERVER: - /* - ** Don't go into an infinite loop if + /* + ** Don't go into an infinite loop if ** the admin gave root NS records in the cache ** file without giving address records ** for the root servers. @@ -730,7 +730,7 @@ fetchns: dprintf(1, (ddt, "ns_req: no address for root NS\n" )); - syslog(LOG_ERR, + syslog(LOG_ERR, "ns_req: no address for root server"); hp->rcode = SERVFAIL; #ifdef DATUMREFCNT @@ -1124,7 +1124,7 @@ addname(name, class) for (ap = addinfo, n = addcount; --n >= 0; ap++) if (strcasecmp(ap->a_dname, name) == 0) return; - + /* add domain name to additional section */ if (addcount < NADDRECS) { @@ -1338,7 +1338,7 @@ doaxfr(np, rfp, top, class) #ifdef NO_GLUE if ((np != top) || (top->n_dname[0] == '\0')) { #endif /*NO_GLUE*/ - /* Glue the sub domains together by sending + /* Glue the sub domains together by sending * the address records for the sub domain * name servers along if necessary. * Glue is necessary if the server is in any zone diff --git a/usr.sbin/named/ns_resp.c b/usr.sbin/named/ns_resp.c index f8086e3..004721b 100644 --- a/usr.sbin/named/ns_resp.c +++ b/usr.sbin/named/ns_resp.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_resp.c 4.65 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: ns_resp.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $ * - * Copyright (c) 1986, 1988, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_resp.c,v 4.9.1.24 1994/07/23 23:23:56 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -317,7 +317,7 @@ ns_resp(msg, msglen) inet_ntoa(from_addr.sin_addr), ntohs(from_addr.sin_port)); } - /* + /* * We don't know who this response came from so it * gets dropped on the floor. */ @@ -355,7 +355,7 @@ ns_resp(msg, msglen) rtrip = ((tt.tv_sec - stp->tv_sec) * 1000 + (tt.tv_usec - stp->tv_usec) / 1000); } - + dprintf(3, (ddt, "stime %d/%d now %d/%d rtt %d\n", stp->tv_sec, stp->tv_usec, tt.tv_sec, tt.tv_usec, rtrip)); @@ -374,7 +374,7 @@ ns_resp(msg, msglen) ns->d_nstime = (u_int32_t)rtrip; else ns->d_nstime = (u_int32_t) - (ns->d_nstime * ALPHA + (ns->d_nstime * ALPHA + (1-ALPHA) * (u_int32_t)rtrip); /* prevent floating point overflow, @@ -404,7 +404,7 @@ ns_resp(msg, msglen) * Watch out for records that may have timed out * and are no longer the correct type. XXX */ - + for (n = 0, qs = qp->q_addr; n < qp->q_naddr; n++, qs++) { ns2 = qs->nsdata; if ((!ns2) || (ns2 == ns)) @@ -714,7 +714,7 @@ ns_resp(msg, msglen) * If there are addresses and this is a local query, * sort them appropriately for the local context. */ - if (ancount > 1 && (lp = local(&qp->q_from)) != NULL) + if (ancount > 1 && (lp = local(&qp->q_from)) != NULL) sort_response(tp, ancount, lp, msg + msglen); /* @@ -1231,7 +1231,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred) if ( (hp->opcode == UPDATED) || (hp->opcode == UPDATEDA) ) { if (cp != (u_char *)(msg + msglen)) { dprintf(1, - (ddt, + (ddt, "FORMERR UPDATE message length off\n" ) ); @@ -1239,7 +1239,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred) return (-1); } } - if ((zonenum = findzone(dname, class)) == 0) { + if ((zonenum = findzone(dname, class)) == 0) { hp->rcode = NXDOMAIN; return (-1); } @@ -1319,7 +1319,7 @@ doupdate(msg, msglen, rrp, zone, savens, flags, cred) hp->rcode = FORMERR; return (-1); } - if ((zonenum = findzone(dname, class)) == 0) { + if ((zonenum = findzone(dname, class)) == 0) { hp->rcode = NXDOMAIN; return (-1); } @@ -1426,7 +1426,7 @@ send_msg(msg, msglen, qp) #ifdef DEBUG if (debug) { fprintf(ddt,"send_msg -> [%s] (%s %d %d) id=%d\n", - inet_ntoa(qp->q_from.sin_addr), + inet_ntoa(qp->q_from.sin_addr), qp->q_stream == QSTREAM_NULL ? "UDP" : "TCP", qp->q_stream == QSTREAM_NULL ? qp->q_dfd : qp->q_stream->s_rfd, @@ -1640,7 +1640,7 @@ sysquery(dname, class, type, nss, nsc) dprintf(1, (ddt, "sysquery: send -> [%s].%d dfd=%d nsid=%d id=%d retry=%ld\n", inet_ntoa(nsa->sin_addr), - ntohs(nsa->sin_port), qp->q_dfd, + ntohs(nsa->sin_port), qp->q_dfd, ntohs(qp->q_nsid), ntohs(qp->q_id), qp->q_time)); #ifdef DEBUG @@ -1708,7 +1708,7 @@ check_root() check_ns(); } -/* +/* * Check the root to make sure that for each NS record we have a A RR */ static void @@ -1792,7 +1792,7 @@ findns(npp, class, nsp, countp, flag) register struct databuf *dp; register struct databuf **nspp; struct hashbuf *htp; - + #ifdef DATUMREFCNT nsp[0] = NULL; #endif @@ -1916,7 +1916,7 @@ finddata(np, class, type, hp, dnamep, lenp, countp) /* cycle order of RRs, for a load balancing effect... */ register struct databuf **dpp; - + for (dpp = &np->n_data; dp = *dpp; dpp = &dp->d_next) { if (dp->d_next && wanted(dp, class, type)) { register struct databuf *lp; @@ -1934,7 +1934,7 @@ finddata(np, class, type, hp, dnamep, lenp, countp) } } #endif /*ROUND_ROBIN*/ - + buflen = *lenp; cp = ((char *)hp) + *countp; for (dp = np->n_data; dp != NULL; dp = dp->d_next) { diff --git a/usr.sbin/named/ns_sort.c b/usr.sbin/named/ns_sort.c index c35b58f..6e77de6 100644 --- a/usr.sbin/named/ns_sort.c +++ b/usr.sbin/named/ns_sort.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_sort.c 4.10 (Berkeley) 3/3/91"; -static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $"; +static char rcsid[] = "$Id: ns_sort.c,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $" * - * Copyright (c) 1986, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $" * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_sort.c,v 4.9.1.6 1994/07/23 23:23:56 vixie Exp $" * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/ns_stats.c b/usr.sbin/named/ns_stats.c index d6d6225..4a11820 100644 --- a/usr.sbin/named/ns_stats.c +++ b/usr.sbin/named/ns_stats.c @@ -1,6 +1,6 @@ #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)ns_stats.c 4.10 (Berkeley) 6/27/90"; -static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $"; +static char rcsid[] = "$Id: ns_stats.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $"; #endif /* not lint */ /* @@ -8,7 +8,7 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $ * 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 @@ -38,14 +38,14 @@ static char rcsid[] = "$Id: ns_stats.c,v 4.9.1.7 1994/06/06 09:08:15 vixie Exp $ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -101,7 +101,7 @@ static const char *typenames[T_ANY+1] = { /* 240 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 250 */ - 0, 0, "AXFR", "MAILB", "MAILA", "ANY" + 0, 0, "AXFR", "MAILB", "MAILA", "ANY" }; static void nameserStats __P((FILE *)); @@ -204,7 +204,7 @@ nameserCompar(t1, t2) else return (0); } - + struct nameser * nameserFind(addr, flags) struct in_addr addr; diff --git a/usr.sbin/named/ns_validate.c b/usr.sbin/named/ns_validate.c index f1236c5..4609518 100644 --- a/usr.sbin/named/ns_validate.c +++ b/usr.sbin/named/ns_validate.c @@ -40,7 +40,7 @@ static TO_Validate *validateQ, *currentVQ; static int VQcount; /***************************************************************** - * validate() is called from dovalidate(). it takes as parameters, + * validate() is called from dovalidate(). it takes as parameters, * the domain name sought, the class, type etc. of record, the server * that gave us the answer and the data it gave us * @@ -63,8 +63,8 @@ static int VQcount; * if(data agrees with what we have) * return VALID_NO_CACHE; * else return INVALID; - * - * if(we are not authoritative) /findns() returned OK;/ + * + * if(we are not authoritative) /findns() returned OK;/ * if (address records for NS's found in cache){ * if("server" = one of the addresses){ * return VALID_CACHE; @@ -129,7 +129,7 @@ validate(dname, server, type, class, data, dlen np = NULL; else np = nlookup(dname, &htp, &fname, 0); - + /* we were able to locate namebufs for this domain, or a parent domain, * or ??? */ @@ -150,7 +150,7 @@ validate(dname, server, type, class, data, dlen } switch (findns(&np, class, nsp, &count, 0)) { case NXDOMAIN: - /** we are authoritative for this domain, lookup name + /** we are authoritative for this domain, lookup name * in our zone data, if it matches, return valid. * in either case, do not cache **/ @@ -164,7 +164,7 @@ validate(dname, server, type, class, data, dlen #ifdef NCACHE if(rcode == NXDOMAIN) { /* If we had an exactmatch on the name, we found the - * name in our authority database, so this couldn't + * name in our authority database, so this couldn't * have been a bad name. INVALID data, say so */ if (exactmatch) @@ -178,7 +178,7 @@ validate(dname, server, type, class, data, dlen } #endif if (!strcasecmp(dname, np->n_dname)) { - + /* if the name we seek is the same as that we have ns * records for, compare the data we have to see if it * matches. if it does, return valid_no_cache, if it @@ -189,7 +189,7 @@ validate(dname, server, type, class, data, dlen else return INVALID; } - + /* we found ns records in a higher level, if we were unable to * locate the exact name earlier, it means we are * authoritative for this domain but do not have records for @@ -197,7 +197,7 @@ validate(dname, server, type, class, data, dlen */ if (!exactmatch) return INVALID; - + /* we found the exact name earlier and we are obviously * authoritative so check for data records and see if any * match. @@ -206,7 +206,7 @@ validate(dname, server, type, class, data, dlen return VALID_NO_CACHE; else return INVALID; - + case SERVFAIL:/* could not find name server records*/ /* stick_in_queue(dname, type, class, data); */ if (needs_prime_cache) @@ -215,7 +215,7 @@ validate(dname, server, type, class, data, dlen free_nsp(nsp); #endif return INVALID; - + case OK: /*proceed */ dprintf(5, (ddt, @@ -244,7 +244,7 @@ validate(dname, server, type, class, data, dlen } /*validate*/ /*********************************************************************** - * validate rr returned by somebody against your own database, if you are + * validate rr returned by somebody against your own database, if you are * authoritative for the information. if you have a record that matches, * return 1, else return 0. validate() above will use this and determine * if the record should be returned/discarded. @@ -257,10 +257,10 @@ isvalid(np, type, class, data, dlen) int dlen; { register struct databuf *dp; - + for (dp = np->n_data; dp != NULL; dp = dp->d_next) { if (!wanted(dp, class, type)) { - if ((type == T_CNAME) && (class == dp->d_class)) { + if ((type == T_CNAME) && (class == dp->d_class)) { /* if a cname exists, any other will not */ return(0); /* we come here only for zone info, @@ -269,9 +269,9 @@ isvalid(np, type, class, data, dlen) } continue; } - /* type and class match, if i get here + /* type and class match, if i get here * let's now compare the data section, per RR type - */ + */ /* unless, of course, the data was negative, in which case * we should return FAILURE since we should not have found @@ -279,8 +279,8 @@ isvalid(np, type, class, data, dlen) */ if ((data == NULL) || (dlen == 0)) { return 0; - } - + } + /* XXX: why aren't we just calling db_cmp() ? */ @@ -321,7 +321,7 @@ isvalid(np, type, class, data, dlen) if (x == 0) return (1); else - break; + break; case T_MINFO: case T_SOA: @@ -329,16 +329,16 @@ isvalid(np, type, class, data, dlen) /* compare first string */ x = strncasecmp((char *)dp->d_data, data, strlen(data) + 1); - if (x != 0) + if (x != 0) break; /* move to second string */ td = data + (strlen(data) + 1); - tdp = dp->d_data + + tdp = dp->d_data + (strlen((char *)dp->d_data)+1); /* compare second string */ - x = strncasecmp(td, (char *)tdp, + x = strncasecmp(td, (char *)tdp, strlen((char *)td+1)); if (x != 0) break; @@ -357,7 +357,7 @@ isvalid(np, type, class, data, dlen) if (x != 0) break; } - + /* everything was equal, wow! * so return a success */ @@ -372,7 +372,7 @@ isvalid(np, type, class, data, dlen) break; td = data + INT16SZ; tdp = dp->d_data + INT16SZ; - x = strncasecmp(td, (char *)tdp, + x = strncasecmp(td, (char *)tdp, strlen((char *)td) + 1); if (x != 0) break; @@ -390,8 +390,8 @@ isvalid(np, type, class, data, dlen) */ if ((data == NULL) || (dlen == 0)) { /* negative data, report success */ - return 1; - } + return 1; + } /* positive data, no such RR, validation failed */ return (0); } @@ -399,8 +399,8 @@ isvalid(np, type, class, data, dlen) /****************************************************************** * get a list of databufs that have ns addresses for the closest domain * you know about, get their addresses and confirm that server indeed - * is one of them. if yes return 1 else 0. - * first checks the cache that we build in nslookup() earlier + * is one of them. if yes return 1 else 0. + * first checks the cache that we build in nslookup() earlier * when we ns_forw(). if unableto find it there, it checks the entire * hash table to do address translations. *******************************************************************/ @@ -416,7 +416,7 @@ check_addr_ns(nsp, server, dname) struct databuf **nsdp; dprintf(5, (ddt, - "check_addr_ns: s:[%s], db:0x%x, d:\"%s\"\n", + "check_addr_ns: s:[%s], db:0x%x, d:\"%s\"\n", inet_ntoa(*saddr), nsp, dname)); for(i = lastNA; i != firstNA; i = (i+1) % MAXNAMECACHE) { @@ -450,7 +450,7 @@ check_addr_ns(nsp, server, dname) } /************************************************************************* - * checks in hash tables for the address of servers whose name is in the + * checks in hash tables for the address of servers whose name is in the * data section of nsp records. borrows code from nslookup()/ns_forw.c * largely. *************************************************************************/ @@ -466,10 +466,10 @@ check_in_tables(nsp, server, syslogdname) char *dname, *fname; int class; int qcomp(); - + dprintf(3, (ddt, "check_in_tables(nsp=x%x,qp=x%x,'%s')\n", nsp, server, syslogdname)); - + while ((nsdp = *nsp++) != NULL) { class = nsdp->d_class; dname = (char *)nsdp->d_data; @@ -563,7 +563,7 @@ store_name_addr(servername, serveraddr, syslogdname, sysloginfo) (char *)malloc((unsigned)strlen(servername)+1); strcpy(nameaddrlist[i].nsname, servername); return; - } + } } /* we have to add this one to our cache */ @@ -591,9 +591,9 @@ store_name_addr(servername, serveraddr, syslogdname, sysloginfo) * Decode the resource record 'rrp' and validate the RR. * Borrows code almost entirely from doupdate(). is a rather * non-invasive routine since it just goes thru the same motions - * as doupdate but just marks the array validatelist entry as + * as doupdate but just marks the array validatelist entry as * the return code from validate(). This is later used in doupdate - * to cache/not cache the entry. also used in update_msg() to + * to cache/not cache the entry. also used in update_msg() to * delete/keep the record from the outgoing message. */ int @@ -875,7 +875,7 @@ update_msg(msg, msglen, Vlist, c) } #endif /* just making sure we do not do all the work for nothing */ - for (i=0; i<c; i++) { + for (i=0; i<c; i++) { if (Vlist[i] == INVALID) { inv = 1; break; @@ -961,7 +961,7 @@ update_msg(msg, msglen, Vlist, c) newlen += (n_new+2*INT16SZ); rembuflen -= (n_new+2*INT16SZ); /* have to decode and copy every Valid RR from here */ - + cp = msg +HFIXEDSZ +qlen; /*skip header and query section*/ for (i = 0; i < c; i++) { if (Vlist[i] == INVALID) { @@ -975,7 +975,7 @@ update_msg(msg, msglen, Vlist, c) hp->rcode = FORMERR; goto badend; } - n_new = dn_comp(dname, newcp, rembuflen, dnptrs, edp); + n_new = dn_comp(dname, newcp, rembuflen, dnptrs, edp); if (n_new < 0) goto badend; cp += n; @@ -1110,7 +1110,7 @@ update_msg(msg, msglen, Vlist, c) bcopy(cp,newcp,INT16SZ); cp += INT16SZ; newcp += INT16SZ; - + /* get name */ n = dn_expand(msg, eom, cp, (char *)data, sizeof data); if (n < 0) { @@ -1145,7 +1145,7 @@ update_msg(msg, msglen, Vlist, c) } *msglen = newlen; free((char *)newmsg); - + #ifdef DEBUG if (debug >= 10) fp_query(msg, ddt); diff --git a/usr.sbin/named/options.h b/usr.sbin/named/options.h index e33589b..7c34407 100644 --- a/usr.sbin/named/options.h +++ b/usr.sbin/named/options.h @@ -1,15 +1,15 @@ /* options.h - specify the conditionally-compiled features * vix 28mar92 [moved out of the Makefile because they were getting too big] * - * $Id: options.h,v 1.1 1994/09/22 20:45:07 pst Exp $ + * $Id: options.h,v 1.2 1995/05/09 12:48:17 rgrimes Exp $ */ /* * ++Copyright++ * - - * Copyright (c) + * Copyright (c) * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * 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 @@ -39,14 +39,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/pathnames.h b/usr.sbin/named/pathnames.h index bcbe642..5adf1a2 100644 --- a/usr.sbin/named/pathnames.h +++ b/usr.sbin/named/pathnames.h @@ -1,6 +1,6 @@ /* * @(#)pathnames.h 5.4 (Berkeley) 6/1/90 - * $Id: pathnames.h,v 4.9.1.5 1994/04/09 03:43:17 vixie Exp $ + * $Id: pathnames.h,v 1.1.1.1 1994/09/22 19:46:13 pst Exp $ */ /* @@ -8,7 +8,7 @@ * - * Copyright (c) 1989 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -24,7 +24,7 @@ * 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 @@ -38,14 +38,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/portability.h b/usr.sbin/named/portability.h index 1aeb233..fa257cd 100644 --- a/usr.sbin/named/portability.h +++ b/usr.sbin/named/portability.h @@ -1,15 +1,15 @@ /* defs.h - include or define things that aren't present on all systems * vixie@decwrl 26dec92 [new] * - * $Id: portability.h,v 4.9.1.24 1994/07/22 08:42:30 vixie Exp $ + * $Id: portability.h,v 1.1 1994/09/22 20:45:08 pst Exp $ */ /* * ++Copyright++ * - - * Copyright (c) + * Copyright (c) * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -25,7 +25,7 @@ * 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 @@ -39,14 +39,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT diff --git a/usr.sbin/named/storage.c b/usr.sbin/named/storage.c index 5f995cc..294c80a 100644 --- a/usr.sbin/named/storage.c +++ b/usr.sbin/named/storage.c @@ -3,7 +3,7 @@ * - * Copyright (c) 1985, 1989 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -19,7 +19,7 @@ * 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 @@ -33,14 +33,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -70,18 +70,18 @@ * * Author - * Michael John Muuss - * + * * Source - * SECAD/VLD Computing Consortium, Bldg 394 * The U. S. Army Ballistic Research Laboratory * Aberdeen Proving Ground, Maryland 21005-5066 - * + * * Copyright Notice - * This software is Copyright (C) 1987 by the United States Army. * All rights reserved. */ #ifndef lint -static char RCSid[] = "$Id: storage.c,v 1.1.1.1 1994/09/22 19:46:14 pst Exp $"; +static char RCSid[] = "$Id: storage.c,v 1.2 1994/09/22 20:45:09 pst Exp $"; #endif #undef malloc @@ -160,7 +160,7 @@ ok: ; /* * R T _ P R M E M - * + * * Print map of memory currently in use. */ void diff --git a/usr.sbin/named/tools/nsquery/nsquery.c b/usr.sbin/named/tools/nsquery/nsquery.c index 2a00de0..c1ac28e 100644 --- a/usr.sbin/named/tools/nsquery/nsquery.c +++ b/usr.sbin/named/tools/nsquery/nsquery.c @@ -3,7 +3,7 @@ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -19,7 +19,7 @@ * 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 @@ -33,14 +33,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -62,7 +62,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)nsquery.c 4.8 (Berkeley) 6/1/90"; -static char rcsid[] = "$Id: nsquery.c,v 4.9.1.4 1994/06/11 22:05:07 vixie Exp $"; +static char rcsid[] = "$Id: nsquery.c,v 1.2 1994/09/22 20:45:28 pst Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/named/tools/nstest/nstest.c b/usr.sbin/named/tools/nstest/nstest.c index 9104a8e..d40e748 100644 --- a/usr.sbin/named/tools/nstest/nstest.c +++ b/usr.sbin/named/tools/nstest/nstest.c @@ -3,7 +3,7 @@ * - * Copyright (c) 1986 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -19,7 +19,7 @@ * 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 @@ -33,14 +33,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -62,7 +62,7 @@ char copyright[] = #ifndef lint static char sccsid[] = "@(#)nstest.c 4.15 (Berkeley) 3/21/91"; -static char rcsid[] = "$Id: nstest.c,v 4.9.1.6 1994/06/01 21:10:11 vixie Exp $"; +static char rcsid[] = "$Id: nstest.c,v 1.2 1994/09/22 20:45:31 pst Exp $"; #endif /* not lint */ #include <sys/param.h> diff --git a/usr.sbin/named/tree.c b/usr.sbin/named/tree.c index 58607ea..98988e7 100644 --- a/usr.sbin/named/tree.c +++ b/usr.sbin/named/tree.c @@ -93,7 +93,7 @@ tree_init(ppr_tree) *ppr_tree = NULL; RETV } - + tree_t tree_srch(ppr_tree, pfi_compare, p_user) diff --git a/usr.sbin/named/xfer/named-xfer.c b/usr.sbin/named/xfer/named-xfer.c index b2546d0..74f65ea 100644 --- a/usr.sbin/named/xfer/named-xfer.c +++ b/usr.sbin/named/xfer/named-xfer.c @@ -11,7 +11,7 @@ * - * Copyright (c) 1988, 1990 * The Regents of the University of California. All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,7 +27,7 @@ * 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 @@ -41,14 +41,14 @@ * SUCH DAMAGE. * - * Portions Copyright (c) 1993 by Digital Equipment Corporation. - * + * * 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, and that * the name of Digital Equipment Corporation not be used in advertising or * publicity pertaining to distribution of the document or software without * specific, written prior permission. - * + * * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT @@ -70,7 +70,7 @@ char copyright[] = #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#)named-xfer.c 4.18 (Berkeley) 3/7/91"; -static char rcsid[] = "$Id: named-xfer.c,v 4.9.1.23 1994/07/22 08:42:39 vixie Exp $"; +static char rcsid[] = "$Id: named-xfer.c,v 1.2 1994/09/22 20:45:34 pst Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -202,7 +202,7 @@ main(argc, argv) case 'z': /* zone == domain */ domain = optarg; domain_len = strlen(domain); - while ((domain_len > 0) && + while ((domain_len > 0) && (domain[domain_len-1] == '.')) domain[--domain_len] = '\0'; break; @@ -339,7 +339,7 @@ main(argc, argv) buildprotolist(); /* init zone data */ - + zp = &zone; #ifdef STUBS if (stub_only) @@ -427,7 +427,7 @@ main(argc, argv) } /*NOTREACHED*/ } - + static char *UsageText[] = { "\t-z zone_to_transfer\n", "\t-f db_file\n", @@ -549,7 +549,7 @@ getzone(zp, serial_no, port) syslog(LOG_ERR, "socket: %m"); error++; break; - } + } dprintf(2, (ddt, "connecting to server #%d [%s].%d\n", cnt+1, inet_ntoa(sin.sin_addr), ntohs(sin.sin_port))); @@ -559,7 +559,7 @@ getzone(zp, serial_no, port) error++; (void) my_close(s); continue; - } + } tryagain: n = res_mkquery(QUERY, zp->z_origin, Class, T_SOA, NULL, 0, NULL, buf, bufsize); @@ -583,7 +583,7 @@ tryagain: syslog(LOG_ERR, "writemsg: %m"); error++; (void) my_close(s); - continue; + continue; } /* * Get out your butterfly net and catch the SOA @@ -630,7 +630,7 @@ tryagain: * 2) not an authority response * 3) both the number of answers and authority count < 1) */ - if (hp->rcode != NOERROR || !(hp->aa) || + if (hp->rcode != NOERROR || !(hp->aa) || (ancount < 1 && aucount < 1)) { #ifndef GEN_AXFR if (Class == C_IN) { @@ -689,7 +689,7 @@ tryagain: type = T_SOA; else if (!nscnt) type = T_NS; - else + else type = T_SOA; } else #endif @@ -729,7 +729,7 @@ tryagain: syslog(LOG_ERR,"writemsg: %m"); error++; (void) my_close(s); - break; + break; } } /* @@ -805,7 +805,7 @@ tryagain: error++; break; } - + } else { #endif /*STUBS*/ n = print_output(buf, bufsize, cp); @@ -941,7 +941,7 @@ read_alarm() { read_interrupted = 1; } - + static int netread(fd, buf, len, timeout) int fd; @@ -1217,7 +1217,7 @@ print_output(msg, msglen, rrp) * that might have been altered by ignored records. * (This means that we sometimes output unnecessary $ORIGIN * lines, but that is harmless.) - * + * * Also update prev_comment now. */ if (prev_comment && ignore[0] == '\0') { |
