From: Mark Andrews <marka@isc.org>
Date: Mon, 17 Feb 2014 13:27:15 +0000 (+1100)
Subject: 3742.   [port]          linux: libcap support: curval was used before it
X-Git-Tag: v9.10.0b1~96
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=51143259789034ac19e12984a8390b9f86ab368c;p=thirdparty%2Fbind9.git

3742.   [port]          linux: libcap support: curval was used before it
                        was declared. [RT #35387]
---

diff --git a/CHANGES b/CHANGES
index 11f47daf1eb..2cae81f5aed 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3742.	[port]		linux: libcap support: curval was used before it
+			was declared. [RT #35387]
+
 3741.	[func]		"delve" (domain entity lookup and validation engine):
 			A new tool with dig-like semantics for performing DNS
 			lookups, with internal DNSSEC validation, using the
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index d6c82a764ad..78b79506797 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -197,8 +197,8 @@ linux_setcaps(cap_t caps) {
 #ifdef HAVE_LIBCAP
 #define SET_CAP(flag) \
 	do { \
-		capval = (flag); \
 		cap_flag_value_t curval; \
+		capval = (flag); \
 		err = cap_get_flag(curcaps, capval, CAP_PERMITTED, &curval); \
 		if (err != -1 && curval) { \
 			err = cap_set_flag(caps, CAP_EFFECTIVE, 1, &capval, CAP_SET); \