diff --git a/lib/dns/gen.c b/lib/dns/gen.c index daa020c3bd..4a8d50ea54 100644 --- a/lib/dns/gen.c +++ b/lib/dns/gen.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2009, 2012-2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2009, 2012-2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2003 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c index 9a5a51def9..b6d6625906 100644 --- a/lib/dns/rdata.c +++ b/lib/dns/rdata.c @@ -450,11 +450,11 @@ typemap_totext(isc_region_t *sr, dns_rdata_textctx_t *tctx, isc_boolean_t first = ISC_FALSE; for (i = 0; i < sr->length; i += len) { - if (tctx != NULL && + if (tctx != NULL && (tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0) { - RETERR(str_totext(tctx->linebreak, target)); - first = ISC_TRUE; - } + RETERR(str_totext(tctx->linebreak, target)); + first = ISC_TRUE; + } INSIST(i + 2 <= sr->length); window = sr->base[i]; len = sr->base[i + 1]; diff --git a/lib/dns/tests/Makefile.in b/lib/dns/tests/Makefile.in index 360ecce540..3aed4062f4 100644 --- a/lib/dns/tests/Makefile.in +++ b/lib/dns/tests/Makefile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2014 Internet Systems Consortium, Inc. ("ISC") +# Copyright (C) 2011-2015 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 diff --git a/lib/irs/resconf.c b/lib/irs/resconf.c index b2f54b8d21..de953ff62e 100644 --- a/lib/irs/resconf.c +++ b/lib/irs/resconf.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009, 2011, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2009, 2011, 2012, 2014, 2015 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 diff --git a/lib/isc/buffer.c b/lib/isc/buffer.c index 22ddfd518f..d0f08d7671 100644 --- a/lib/isc/buffer.c +++ b/lib/isc/buffer.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004-2008, 2012, 2014 Internet Systems Consortium, Inc. ("ISC") + * Copyright (C) 2004-2008, 2012, 2014, 2015 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1998-2002 Internet Software Consortium. * * Permission to use, copy, modify, and/or distribute this software for any