diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-07-16 10:49:33 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-07-16 10:49:33 +0000 |
| commit | 473038528ab5bd55332138ebf791ab91a25f747b (patch) | |
| tree | cb160fa2acd93f24b5f5b9082cd3afc68396d51a /lib/isc/netaddr.c | |
| parent | 46da9ebeb3b1241e2e7f0182d76c336966e91d20 (diff) | |
| download | src-473038528ab5bd55332138ebf791ab91a25f747b.tar.gz src-473038528ab5bd55332138ebf791ab91a25f747b.zip | |
Vendor import of BIND 9.8.0-P4vendor/bind9/9.8.0-P4
Notes
Notes:
svn path=/vendor/bind9/dist/; revision=224090
svn path=/vendor/bind9/9.8.0-P4/; revision=224091; tag=vendor/bind9/9.8.0-P4
Diffstat (limited to 'lib/isc/netaddr.c')
| -rw-r--r-- | lib/isc/netaddr.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/isc/netaddr.c b/lib/isc/netaddr.c index 92c4fe5b4d4c..33dddb8d1b5b 100644 --- a/lib/isc/netaddr.c +++ b/lib/isc/netaddr.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2005, 2007 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004, 2005, 2007, 2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any @@ -15,7 +15,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr.c,v 1.38 2007-06-18 23:47:44 tbox Exp $ */ +/* $Id: netaddr.c,v 1.41 2010-11-17 23:47:08 tbox Exp $ */ /*! \file */ @@ -303,18 +303,18 @@ isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) { isc_result_t isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { #ifdef ISC_PLATFORM_HAVESYSUNH - if (strlen(path) > sizeof(netaddr->type.un) - 1) - return (ISC_R_NOSPACE); - - memset(netaddr, 0, sizeof(*netaddr)); - netaddr->family = AF_UNIX; - strcpy(netaddr->type.un, path); - netaddr->zone = 0; - return (ISC_R_SUCCESS); -#else + if (strlen(path) > sizeof(netaddr->type.un) - 1) + return (ISC_R_NOSPACE); + + memset(netaddr, 0, sizeof(*netaddr)); + netaddr->family = AF_UNIX; + strcpy(netaddr->type.un, path); + netaddr->zone = 0; + return (ISC_R_SUCCESS); +#else UNUSED(netaddr); UNUSED(path); - return (ISC_R_NOTIMPLEMENTED); + return (ISC_R_NOTIMPLEMENTED); #endif } |