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

conditionally declare strbuf
---

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 51b11bb1388..ec8346a4383 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2011, 2013, 2014, 2016, 2017  Internet Systems Consortium, Inc. ("ISC")
+ * Copyright (C) 2004-2011, 2013, 2014, 2016-2018  Internet Systems Consortium, Inc. ("ISC")
  * Copyright (C) 1999-2002  Internet Software Consortium.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
@@ -732,7 +732,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 03e3e6de04c..ff1fec1abbd 100644
--- a/util/copyrights
+++ b/util/copyrights
@@ -283,7 +283,7 @@
 ./bin/named/unix/Makefile.in			MAKE	1999,2000,2001,2004,2007,2009,2011,2012
 ./bin/named/unix/dlz_dlopen_driver.c		C	2011,2012,2013,2014,2017
 ./bin/named/unix/include/named/os.h		C	1999,2000,2001,2002,2004,2005,2007,2008,2009,2016
-./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2016,2017
+./bin/named/unix/os.c				C	1999,2000,2001,2002,2004,2005,2006,2007,2008,2009,2010,2011,2013,2014,2016,2017,2018
 ./bin/named/update.c				C	1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018
 ./bin/named/win32/dlz_dlopen_driver.c		C	2011,2014
 ./bin/named/win32/include/named/ntservice.h	C	1999,2000,2001,2002,2003,2004,2007