From: Mark Andrews <marka@isc.org>
Date: Thu, 15 Feb 2018 05:07:01 +0000 (+1100)
Subject: conditionally declare strbuf
X-Git-Tag: v9.12.1rc1~5^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a896a0247f80ce48e98e152dea5ddc977ed2ebb;p=thirdparty%2Fbind9.git

conditionally declare strbuf
---

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index f6e6da30b29..cfabc3a0c1b 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1999-2002, 2004-2011, 2013-2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 1999-2002, 2004-2011, 2013-2018  Internet Systems Consortium, Inc. ("ISC")
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -755,7 +755,9 @@ mkdirpath(char *filename, void (*report)(const char *, ...)) {
 
 static void
 setperms(uid_t uid, gid_t gid) {
+#if defined(HAVE_SETEGID) || defined(HAVE_SETRESGID)
 	char strbuf[ISC_STRERRORSIZE];
+#endif
 #if !defined(HAVE_SETEGID) && defined(HAVE_SETRESGID)
 	gid_t oldgid, tmpg;
 #endif
diff --git a/util/copyrights b/util/copyrights
index e0beb432083..6335defdc6d 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -214,7 +214,7 @@
 ./bin/named/unix/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2011,2012,2016
 ./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016,2017
 ./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2014,2016,2017
-./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017
+./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2015,2016,2017,2018
 ./bin/named/win32/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2016
 ./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007,2016
 ./bin/named/win32/include/named/os.h		C	1999,2000,2001,2002,2004,2007,2008,2009,2014,2016,2017