Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts.

Browse Source
This commit is contained in:
christos 2004-11-07 02:25:01 +00:00
parent cd4012e9b2
commit 0766545fc7
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libc/resolv/res_debug.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: res_debug.c,v 1.6 2004/05/21 16:03:05 christos Exp $ */
/* $NetBSD: res_debug.c,v 1.7 2004/11/07 02:25:01 christos Exp $ */
/*
* Copyright (c) 1985
@ -99,9 +99,9 @@
#if defined(LIBC_SCCS) && !defined(lint)
#ifdef notdef
static const char sccsid[] = "@(#)res_debug.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_debug.c,v 1.3.2.5.4.4 2004/04/13 06:53:20 marka Exp";
static const char rcsid[] = "Id: res_debug.c,v 1.3.2.5.4.5 2004/07/28 20:16:46 marka Exp";
#else
__RCSID("$NetBSD: res_debug.c,v 1.6 2004/05/21 16:03:05 christos Exp $");
__RCSID("$NetBSD: res_debug.c,v 1.7 2004/11/07 02:25:01 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -569,7 +569,7 @@ p_type(int type) {
result = sym_ntos(__p_type_syms, type, &success);
if (success)
return (result);
if (type < 0 || type > 0xfff)
if (type < 0 || type > 0xffff)
return ("BADTYPE");
sprintf(typebuf, "TYPE%d", type);
return (typebuf);
@ -605,7 +605,7 @@ p_class(int class) {
result = sym_ntos(__p_class_syms, class, &success);
if (success)
return (result);
if (class < 0 || class > 0xfff)
if (class < 0 || class > 0xffff)
return ("BADCLASS");
sprintf(classbuf, "CLASS%d", class);
return (classbuf);

9
lib/libc/resolv/res_send.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: res_send.c,v 1.6 2004/05/21 16:03:05 christos Exp $ */
/* $NetBSD: res_send.c,v 1.7 2004/11/07 02:25:01 christos Exp $ */
/*
* Copyright (c) 1985, 1989, 1993
@ -74,9 +74,9 @@
#if defined(LIBC_SCCS) && !defined(lint)
#ifdef notdef
static const char sccsid[] = "@(#)res_send.c 8.1 (Berkeley) 6/4/93";
static const char rcsid[] = "Id: res_send.c,v 1.5.2.2.4.3 2004/04/12 06:54:59 marka Exp";
static const char rcsid[] = "Id: res_send.c,v 1.5.2.2.4.5 2004/08/10 02:19:56 marka Exp";
#else
__RCSID("$NetBSD: res_send.c,v 1.6 2004/05/21 16:03:05 christos Exp $");
__RCSID("$NetBSD: res_send.c,v 1.7 2004/11/07 02:25:01 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@ -188,7 +188,8 @@ res_ourserver_p(const res_state statp, const struct sockaddr *sa) {
if (srv6->sin6_family == in6p->sin6_family &&
srv6->sin6_port == in6p->sin6_port &&
#ifdef HAVE_SIN6_SCOPE_ID
srv6->sin6_scope_id == in6p->sin6_scope_id &&
(srv6->sin6_scope_id == 0 ||
srv6->sin6_scope_id == in6p->sin6_scope_id) &&
#endif
(IN6_IS_ADDR_UNSPECIFIED(&srv6->sin6_addr) ||
IN6_ARE_ADDR_EQUAL(&srv6->sin6_addr, &in6p->sin6_addr)))