From ada65d99fb1417107a796d4d82e039f1d9a956a0 Mon Sep 17 00:00:00 2001 From: dougb Date: Thu, 1 Sep 2011 05:24:42 +0000 Subject: Vendor import of BIND 9.8.1 --- lib/irs/api | 2 +- lib/irs/getnameinfo.c | 10 ++++------ lib/irs/resconf.c | 5 +++-- 3 files changed, 8 insertions(+), 9 deletions(-) (limited to 'lib/irs') diff --git a/lib/irs/api b/lib/irs/api index 94575eb..78dd0b4 100644 --- a/lib/irs/api +++ b/lib/irs/api @@ -1,3 +1,3 @@ LIBINTERFACE = 80 -LIBREVISION = 0 +LIBREVISION = 1 LIBAGE = 0 diff --git a/lib/irs/getnameinfo.c b/lib/irs/getnameinfo.c index fadd8d8..00809d9 100644 --- a/lib/irs/getnameinfo.c +++ b/lib/irs/getnameinfo.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: getnameinfo.c,v 1.4 2009-09-02 23:48:02 tbox Exp $ */ +/* $Id: getnameinfo.c,v 1.4.346.2 2011-03-12 04:59:18 tbox Exp $ */ /*! \file */ @@ -149,12 +149,12 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, { struct afd *afd; struct servent *sp; - unsigned short port; + unsigned short port = 0; #ifdef IRS_PLATFORM_HAVESALEN size_t len; #endif int family, i; - const void *addr; + const void *addr = NULL; char *p; #if 0 unsigned long v4a; @@ -199,8 +199,6 @@ getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, break; default: - port = 0; - addr = NULL; INSIST(0); } proto = (flags & NI_DGRAM) ? "udp" : "tcp"; diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index af1413b..28077bb7 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011 Internet Systems Consortium, Inc. ("ISC") * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: resconf.c,v 1.3 2009-09-02 23:48:02 tbox Exp $ */ +/* $Id: resconf.c,v 1.3.346.2 2011-03-12 04:59:18 tbox Exp $ */ /*! \file resconf.c */ @@ -517,6 +517,7 @@ irs_resconf_load(isc_mem_t *mctx, const char *filename, irs_resconf_t **confp) stopchar = getword(fp, word, sizeof(word)); if (stopchar == EOF) { rval = ISC_R_SUCCESS; + POST(rval); break; } -- cgit v1.1