d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC: Merge BIND9 9.3.3 into main chunk.

Browse Source 
include/arpa/nameser_compat.h:	1.6
	lib/libc/inet/inet_cidr_ntop.c:	1.1.1.2
	lib/libc/inet/inet_net_ntop.c:	1.3
	lib/libc/isc/eventlib_p.h:	1.4
	lib/libc/resolv/mtctxres.c:	1.3
	lib/libc/resolv/res_init.c:	1.4
	lib/libc/resolv/res_send.c:	1.5
This commit is contained in:
ume 2006-12-22 07:33:20 +00:00
parent 23a5c39525
commit 1cf119375a
7 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/arpa/nameser_compat.h
View File

@ -32,7 +32,7 @@
/*
* from nameser.h 8.1 (Berkeley) 6/2/93
* $Id: nameser_compat.h,v 1.1.2.3.4.2 2004/07/01 04:43:41 marka Exp $
* $Id: nameser_compat.h,v 1.1.2.3.4.3 2006/05/19 02:38:15 marka Exp $
* $FreeBSD$
*/

10
lib/libc/inet/inet_cidr_ntop.c
View File

@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.3 2005/11/03 23:08:40 marka Exp $";
static const char rcsid[] = "$Id: inet_cidr_ntop.c,v 1.1.2.1.8.4 2006/10/11 02:32:50 marka Exp $";
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -42,10 +42,10 @@ __FBSDID("$FreeBSD$");
# define SPRINTF(x) ((size_t)sprintf x)
#endif
static char * inet_cidr_ntop_ipv4 __P((const u_char *src, int bits,
char *dst, size_t size));
static char * inet_cidr_ntop_ipv6 __P((const u_char *src, int bits,
char *dst, size_t size));
static char *
inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size);
static char *
inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size);
/*
* char *

4
lib/libc/inet/inet_net_ntop.c
View File

@ -16,7 +16,7 @@
*/
#if defined(LIBC_SCCS) && !defined(lint)
static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.1 2004/03/09 08:33:32 marka Exp $";
static const char rcsid[] = "$Id: inet_net_ntop.c,v 1.1.2.1.8.2 2006/06/20 02:53:07 marka Exp $";
#endif
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -266,7 +266,7 @@ inet_net_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size) {
}
}
/* Format CIDR /width. */
SPRINTF((cp, "/%u", bits));
sprintf(cp, "/%u", bits);
if (strlen(outbuf) + 1 > size)
goto emsgsize;
strcpy(dst, outbuf);

4
lib/libc/isc/eventlib_p.h
View File

@ -18,7 +18,7 @@
/* eventlib_p.h - private interfaces for eventlib
* vix 09sep95 [initial]
*
* $Id: eventlib_p.h,v 1.3.2.1.4.3 2005/07/28 07:43:20 marka Exp $
* $Id: eventlib_p.h,v 1.3.2.1.4.4 2006/03/10 00:17:21 marka Exp $
* $FreeBSD$
*/
@ -48,6 +48,8 @@
#define EV_MASK_ALL (EV_READ | EV_WRITE | EV_EXCEPT)
#define EV_ERR(e) return (errno = (e), -1)
#define OK(x) if ((x) < 0) EV_ERR(errno); else (void)NULL
#define OKFREE(x, y) if ((x) < 0) { FREE((y)); EV_ERR(errno); } \
else (void)NULL
#define NEW(p) if (((p) = memget(sizeof *(p))) != NULL) \
FILL(p); \

7
lib/libc/resolv/mtctxres.c
View File

@ -118,9 +118,10 @@ ___mtctxres(void) {
*/
if (!mt_key_initialized) {
static pthread_mutex_t keylock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_lock(&keylock);
_mtctxres_init();
pthread_mutex_unlock(&keylock);
if (pthread_mutex_lock(&keylock) == 0) {
_mtctxres_init();
(void) pthread_mutex_unlock(&keylock);
}
}
/*

17
lib/libc/resolv/res_init.c
View File

@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
static const char sccsid[] = "@(#)res_init.c 8.1 (Berkeley) 6/7/93";
static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.5 2005/11/03 00:00:52 marka Exp $";
static const char rcsid[] = "$Id: res_init.c,v 1.9.2.5.4.6 2006/08/30 23:23:01 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -243,17 +243,10 @@ __res_vinit(res_state statp, int preinit) {
if (buf[0] == '+')
buf[0] = '.';
cp = strchr(buf, '.');
if (cp == NULL) {
if (strlcpy(statp->defdname, buf,
sizeof(statp->defdname))
>= sizeof(statp->defdname))
goto freedata;
} else {
if (strlcpy(statp->defdname, cp+1,
sizeof(statp->defdname))
>= sizeof(statp->defdname))
goto freedata;
}
cp = (cp == NULL) ? buf : (cp + 1);
if (strlen(cp) >= sizeof(statp->defdname))
goto freedata;
strcpy(statp->defdname, cp);
}
}
#endif /* SOLARIS2 */

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

@ -70,7 +70,7 @@
#if defined(LIBC_SCCS) && !defined(lint)
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.8 2006/03/08 04:13:31 marka Exp $";
static const char rcsid[] = "$Id: res_send.c,v 1.5.2.2.4.9 2006/10/16 23:00:50 marka Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
@ -313,7 +313,8 @@ res_nsend(res_state statp,
highestFD = sysconf(_SC_OPEN_MAX) - 1;
#endif
if (statp->nscount == 0) {
/* No name servers or res_init() failure */
if (statp->nscount == 0 || EXT(statp).ext == NULL) {
errno = ESRCH;
return (-1);
}