conditionally declare strbuf

diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index f6e6da30b29c398220b8483e939df064dfe74765..cfabc3a0c1bb5711586098bc38ca167254be1413 100644 (file)
--- 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 5d2ddcc5a08509374680f4d9e4d11fed242a9fef..7f7044d15404c4fb8351e648bc615f4c024fdfbf 100644 (file)
--- a/util/copyrights
+++ b/util/copyrights
@@ -215,7 +215,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