From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Mon, 4 Jan 2021 09:45:44 +0000 (+0100)
Subject: macro: use ascending order for capabilities
X-Git-Tag: lxc-5.0.0~325^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24b77f47ad4cc791f6be0221b53cc791951a0ee5;p=thirdparty%2Flxc.git

macro: use ascending order for capabilities

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>
---

diff --git a/src/lxc/macro.h b/src/lxc/macro.h
index 3dff01941..7a8e15f38 100644
--- a/src/lxc/macro.h
+++ b/src/lxc/macro.h
@@ -37,6 +37,14 @@
 #endif
 
 /* capabilities */
+#ifndef CAP_SETGID
+#define CAP_SETGID 6
+#endif
+
+#ifndef CAP_SETUID
+#define CAP_SETUID 7
+#endif
+
 #ifndef CAP_SYS_ADMIN
 #define CAP_SYS_ADMIN 21
 #endif
@@ -53,14 +61,6 @@
 #define CAP_MAC_ADMIN 33
 #endif
 
-#ifndef CAP_SETUID
-#define CAP_SETUID 7
-#endif
-
-#ifndef CAP_SETGID
-#define CAP_SETGID 6
-#endif
-
 /* prctl */
 #ifndef PR_CAPBSET_READ
 #define PR_CAPBSET_READ 23