chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
condition: properly allow passing back errors from condition checks
[elogind.git]
/
src
/
shared
/
missing.h
diff --git
a/src/shared/missing.h
b/src/shared/missing.h
index 0cfb6fa4c3895e1740b78c0413b331fcc4792f2c..ecd32babed34061f1b2c791fc351002a95dddcd4 100644
(file)
--- a/
src/shared/missing.h
+++ b/
src/shared/missing.h
@@
-33,6
+33,7
@@
#include <linux/input.h>
#include <linux/if_link.h>
#include <linux/loop.h>
#include <linux/input.h>
#include <linux/if_link.h>
#include <linux/loop.h>
+#include <linux/audit.h>
#ifdef HAVE_AUDIT
#include <libaudit.h>
#ifdef HAVE_AUDIT
#include <libaudit.h>
@@
-74,7
+75,11
@@
#endif
#ifndef MFD_ALLOW_SEALING
#endif
#ifndef MFD_ALLOW_SEALING
-#define MFD_ALLOW_SEALING 0x0002ULL
+#define MFD_ALLOW_SEALING 0x0002U
+#endif
+
+#ifndef MFD_CLOEXEC
+#define MFD_CLOEXEC 0x0001U
#endif
#ifndef IP_FREEBIND
#endif
#ifndef IP_FREEBIND
@@
-121,8
+126,15
@@
static inline int pivot_root(const char *new_root, const char *put_old) {
# elif defined __arm__
# define __NR_memfd_create 385
# elif defined _MIPS_SIM
# elif defined __arm__
# define __NR_memfd_create 385
# elif defined _MIPS_SIM
-# warning "__NR_memfd_create not yet defined for MIPS"
-# define __NR_memfd_create 0xffffffff
+# if _MIPS_SIM == _MIPS_SIM_ABI32
+# define __NR_memfd_create 4354
+# endif
+# if _MIPS_SIM == _MIPS_SIM_NABI32
+# define __NR_memfd_create 6318
+# endif
+# if _MIPS_SIM == _MIPS_SIM_ABI64
+# define __NR_memfd_create 5314
+# endif
# else
# define __NR_memfd_create 356
# endif
# else
# define __NR_memfd_create 356
# endif
@@
-136,7
+148,7
@@
static inline int memfd_create(const char *name, unsigned int flags) {
#ifndef __NR_getrandom
# if defined __x86_64__
#ifndef __NR_getrandom
# if defined __x86_64__
-# define __NR_getrandom
27
8
+# define __NR_getrandom
31
8
# else
# warning "__NR_getrandom unknown for your architecture"
# define __NR_getrandom 0xffffffff
# else
# warning "__NR_getrandom unknown for your architecture"
# define __NR_getrandom 0xffffffff
@@
-149,6
+161,14
@@
static inline int getrandom(void *buffer, size_t count, unsigned flags) {
}
#endif
}
#endif
+#ifndef GRND_NONBLOCK
+#define GRND_NONBLOCK 0x0001
+#endif
+
+#ifndef GRND_RANDOM
+#define GRND_RANDOM 0x0002
+#endif
+
#ifndef BTRFS_IOCTL_MAGIC
#define BTRFS_IOCTL_MAGIC 0x94
#endif
#ifndef BTRFS_IOCTL_MAGIC
#define BTRFS_IOCTL_MAGIC 0x94
#endif
@@
-420,7
+440,7
@@
static inline int setns(int fd, int nstype) {
#define IFLA_BOND_AD_INFO 23
#define __IFLA_BOND_MAX 24
#define IFLA_BOND_AD_INFO 23
#define __IFLA_BOND_MAX 24
-#define IFLA_BOND_MAX (__IFLA_BOND_MAX - 1)
+#define IFLA_BOND_MAX
(__IFLA_BOND_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_VLAN_PROTOCOL
#endif
#if !HAVE_DECL_IFLA_VLAN_PROTOCOL
@@
-545,3
+565,11
@@
static inline int setns(int fd, int nstype) {
#ifndef LOOPBACK_IFINDEX
#define LOOPBACK_IFINDEX 1
#endif
#ifndef LOOPBACK_IFINDEX
#define LOOPBACK_IFINDEX 1
#endif
+
+#ifndef MAX_AUDIT_MESSAGE_LENGTH
+#define MAX_AUDIT_MESSAGE_LENGTH 8970
+#endif
+
+#ifndef AUDIT_NLGRP_MAX
+#define AUDIT_NLGRP_READLOG 1
+#endif