diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 07:58:26 +0100 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2018-12-04 08:38:14 +0100 |
| commit | 8ca2702f003c34b332501536d0a202db20e80385 (patch) | |
| tree | 927d2c77bc5fbaa437768bb7e756f696d2855f6a | |
| parent | 2a03bb3e65327c73008f1db485ffc75c432dc6b2 (diff) | |
| download | systemd-8ca2702f003c34b332501536d0a202db20e80385.tar.gz | |
missing: move capabilities to missing_capability.h
| -rw-r--r-- | src/basic/meson.build | 1 | ||||
| -rw-r--r-- | src/basic/missing.h | 26 | ||||
| -rw-r--r-- | src/basic/missing_capability.h | 12 |
3 files changed, 14 insertions, 25 deletions
diff --git a/src/basic/meson.build b/src/basic/meson.build index 43ce25cb64..8670bc962f 100644 --- a/src/basic/meson.build +++ b/src/basic/meson.build @@ -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 diff --git a/src/basic/missing.h b/src/basic/missing.h index fdf8d4105c..0f3c59d897 100644 --- a/src/basic/missing.h +++ b/src/basic/missing.h @@ -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 index 0000000000..1308a3d636 --- /dev/null +++ b/src/basic/missing_capability.h @@ -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 |