upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-06-09 00:32:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Resolve conflicts.

Browse source
This commit is contained in:
Jeroen Ruigrok van der Werven 2000-10-31 12:38:22 +00:00
parent 054caa0371
commit bc3a71005f
4 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
contrib/bind/bin/named-xfer/named-xfer.c
View file

@ -131,7 +131,7 @@ char copyright[] =
#if !defined(lint) && !defined(SABER)
static const char sccsid[] = "@(#)named-xfer.c 4.18 (Berkeley) 3/7/91";
static const char rcsid[] = "$Id: named-xfer.c,v 8.93 2000/04/20 07:33:47 vixie Exp $";
static const char rcsid[] = "$Id: named-xfer.c,v 8.94 2000/07/11 05:38:27 vixie Exp $";
#endif /* not lint */
#include "port_before.h"
@ -1216,6 +1216,7 @@ getzone(struct zoneinfo *zp, u_int32_t serial_no, int port) {
* the response.
*/
loop_cnt = 0;
bp = NULL;
do {
u_char *cp4;
u_short type, class, dlen;
@ -1227,6 +1228,9 @@ getzone(struct zoneinfo *zp, u_int32_t serial_no, int port) {
}
tmp += n;
if (loop_cnt == 0)
bp = tmp;
/* Are type, class, and ttl OK? */
cp4 = tmp; /* Leave tmp pointing to type field */
if (eom - cp4 < 3 * INT16SZ + INT32SZ) {
@ -1247,7 +1251,6 @@ getzone(struct zoneinfo *zp, u_int32_t serial_no, int port) {
break;
}
if ((methode == ISIXFR) && (loop_cnt == 0)) {
bp = tmp;
soa_cnt++;
badsoa_msg = soa_zinfo(&zp_finish, tmp, eom);
if (badsoa_msg)

5
contrib/bind/bin/named/Makefile
View file

@ -13,7 +13,7 @@
## ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
## SOFTWARE.
# $Id: Makefile,v 8.49 2000/05/09 07:02:22 vixie Exp $
# $Id: Makefile,v 8.50 2000/07/11 06:41:32 vixie Exp $
# $FreeBSD$
DESTDIR=
@ -48,7 +48,8 @@ INSTALL_LIB=-o bin -g bin
PS=ps
LDFLAGS=
CFLAGS= ${CDEBUG} -I${PORTINCL} -I${INCL} ${DEFS}
CFLAGS= ${CDEBUG}
CPPFLAGS= -I${PORTINCL} -I${INCL} ${DEFS}
VER= LOCAL-`date +%Y%m%d.%H%M%S`
HOSTNAMECMD= hostname || uname -n

11
contrib/bind/bin/nslookup/debug.c
View file

@ -54,7 +54,7 @@
#ifndef lint
static const char sccsid[] = "@(#)debug.c 5.26 (Berkeley) 3/21/91";
static const char rcsid[] = "$Id: debug.c,v 8.15 1999/10/13 16:39:16 vixie Exp $";
static const char rcsid[] = "$Id: debug.c,v 8.16 2000/07/11 05:59:32 vixie Exp $";
#endif /* not lint */
/*
@ -622,8 +622,15 @@ Print_rr(const u_char *ocp, const u_char *msg, const u_char *eom, FILE *file) {
case T_KEY:
default: {
char buf[2048]; /* XXX need to malloc/realloc. */
char rrname[NS_MAXDNAME];
if (ns_sprintrrf(msg, eom - msg, "?", (ns_class)class,
cp2 = p_fqnname(ocp, msg, NS_MAXCDNAME, rrname, sizeof rrname);
if (cp2 == NULL) {
fprintf(file, "(name truncated?)\n");
return (NULL); /* compression error */
}
if (ns_sprintrrf(msg, eom - msg, rrname, (ns_class)class,
(ns_type)type, rrttl, cp1, dlen, NULL, NULL,
buf, sizeof buf) < 0) {
perror("ns_sprintrrf");

10
contrib/bind/bin/nslookup/getinfo.c
View file

@ -54,7 +54,7 @@
#ifndef lint
static const char sccsid[] = "@(#)getinfo.c 5.26 (Berkeley) 3/21/91";
static const char rcsid[] = "$Id: getinfo.c,v 8.15 1999/10/13 16:39:16 vixie Exp $";
static const char rcsid[] = "$Id: getinfo.c,v 8.16 2000/07/11 04:36:26 vixie Exp $";
#endif /* not lint */
/*
@ -651,11 +651,11 @@ GetHostInfoByName(nsAddrPtr, queryClass, queryType, name, hostPtr, isServer)
* - there is at least one dot, there is no trailing dot,
* and RES_DNSRCH is set.
*/
if ((n == 0 && res.options & RES_DEFNAMES) ||
(n != 0 && *--cp != '.' && res.options & RES_DNSRCH))
for (domain = res.dnsrch; *domain; domain++) {
if ((n == 0 && (res.options & RES_DEFNAMES) != 0) ||
(n != 0 && *--cp != '.' && (res.options & RES_DNSRCH) != 0))
for (domain = res.dnsrch; *domain != NULL; domain++) {
result = GetHostDomain(nsAddrPtr, queryClass, queryType,
name, *domain, hostPtr, isServer);
name, *domain, hostPtr, isServer);
/*
* If no server present, give up.
* If name isn't found in this domain,