]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
missing: move capabilities to missing_capability.h
authorYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 4 Dec 2018 06:58:26 +0000 (07:58 +0100)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 4 Dec 2018 07:38:14 +0000 (08:38 +0100)
src/basic/meson.build
src/basic/missing.h
src/basic/missing_capability.h [new file with mode: 0644]

index 43ce25cb64081b0433e5e537abe8b738ccb07e81..8670bc962f34d278449acb9d8f8b340a96ec4210 100644 (file)
@@ -93,6 +93,7 @@ basic_sources = files('''
         mempool.h
         missing_btrfs.h
         missing_btrfs_tree.h
+        missing_capability.h
         missing_ethtool.h
         missing_fib_rules.h
         missing_fou.h
index fdf8d4105c1ffd7888704b8a89b1bc5dc9691764..0f3c59d8971aeaadbfcbbee10dda22beab40476a 100644 (file)
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <inttypes.h>
 #include <linux/audit.h>
-#include <linux/capability.h>
 #include <linux/falloc.h>
 #include <linux/oom.h>
 #include <net/ethernet.h>
@@ -271,30 +270,6 @@ struct sockaddr_vm {
 #define AUDIT_NLGRP_READLOG 1
 #endif
 
-#ifndef CAP_MAC_OVERRIDE
-#define CAP_MAC_OVERRIDE 32
-#endif
-
-#ifndef CAP_MAC_ADMIN
-#define CAP_MAC_ADMIN 33
-#endif
-
-#ifndef CAP_SYSLOG
-#define CAP_SYSLOG 34
-#endif
-
-#ifndef CAP_WAKE_ALARM
-#define CAP_WAKE_ALARM 35
-#endif
-
-#ifndef CAP_BLOCK_SUSPEND
-#define CAP_BLOCK_SUSPEND 36
-#endif
-
-#ifndef CAP_AUDIT_READ
-#define CAP_AUDIT_READ 37
-#endif
-
 #ifndef RENAME_NOREPLACE
 #define RENAME_NOREPLACE (1 << 0)
 #endif
@@ -351,6 +326,7 @@ struct sockaddr_vm {
 #endif
 
 #include "missing_btrfs_tree.h"
+#include "missing_capability.h"
 #include "missing_input.h"
 #include "missing_magic.h"
 #include "missing_network.h"
diff --git a/src/basic/missing_capability.h b/src/basic/missing_capability.h
new file mode 100644 (file)
index 0000000..1308a3d
--- /dev/null
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: LGPL-2.1+ */
+#pragma once
+
+#include <linux/capability.h>
+
+/* 3a101b8de0d39403b2c7e5c23fd0b005668acf48 (3.16) */
+#ifndef CAP_AUDIT_READ
+#define CAP_AUDIT_READ 37
+
+#undef  CAP_LAST_CAP
+#define CAP_LAST_CAP   CAP_AUDIT_READ
+#endif