chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
socket-util: socket_address_parse() should not log errors on its own
[elogind.git]
/
src
/
shared
/
def.h
diff --git
a/src/shared/def.h
b/src/shared/def.h
index a2304fddda8beef06a68b7f2dcce3efe450371be..7958f18c1ea7edbf4cbc50f4f89f17befdc2e46b 100644
(file)
--- a/
src/shared/def.h
+++ b/
src/shared/def.h
@@
-35,7
+35,7
@@
* the watchdog pings will keep the loop busy. */
#define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
* the watchdog pings will keep the loop busy. */
#define DEFAULT_EXIT_USEC (30*USEC_PER_SEC)
-#define SYSTEMD_CGROUP_CONTROLLER "name=
system
d"
+#define SYSTEMD_CGROUP_CONTROLLER "name=
elogin
d"
#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
#define SIGNALS_IGNORE SIGPIPE
#define SIGNALS_CRASH_HANDLER SIGSEGV,SIGILL,SIGFPE,SIGBUS,SIGQUIT,SIGABRT
#define SIGNALS_IGNORE SIGPIPE
@@
-44,6
+44,7
@@
#define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz"
#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
#define LOWERCASE_LETTERS "abcdefghijklmnopqrstuvwxyz"
#define UPPERCASE_LETTERS "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
#define LETTERS LOWERCASE_LETTERS UPPERCASE_LETTERS
+#define ALPHANUMERICAL LETTERS DIGITS
#define REBOOT_PARAM_FILE "/run/systemd/reboot-param"
#define REBOOT_PARAM_FILE "/run/systemd/reboot-param"
@@
-60,18
+61,22
@@
"/usr/lib/kbd/keymaps/\0"
#endif
"/usr/lib/kbd/keymaps/\0"
#endif
-#define UNIX_SYSTEM_BUS_
PATH "unix:path=
/run/dbus/system_bus_socket"
-#define KERNEL_SYSTEM_BUS_
PATH "kernel:path=/dev
/kdbus/0-system/bus"
+#define UNIX_SYSTEM_BUS_
ADDRESS "unix:path=/var
/run/dbus/system_bus_socket"
+#define KERNEL_SYSTEM_BUS_
ADDRESS "kernel:path=/sys/fs
/kdbus/0-system/bus"
#ifdef ENABLE_KDBUS
#ifdef ENABLE_KDBUS
-# define DEFAULT_SYSTEM_BUS_
PATH KERNEL_SYSTEM_BUS_PATH ";" UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS KERNEL_SYSTEM_BUS_ADDRESS ";" UNIX_SYSTEM_BUS_ADDRESS
#else
#else
-# define DEFAULT_SYSTEM_BUS_
PATH UNIX_SYSTEM_BUS_PATH
+# define DEFAULT_SYSTEM_BUS_
ADDRESS UNIX_SYSTEM_BUS_ADDRESS
#endif
#endif
-#define UNIX_USER_BUS_FMT "unix:path=%s/bus"
-#define KERNEL_USER_BUS_
FMT "kernel:path=/dev/kdbus/%lu
-user/bus"
+#define UNIX_USER_BUS_
ADDRESS_
FMT "unix:path=%s/bus"
+#define KERNEL_USER_BUS_
ADDRESS_FMT "kernel:path=/sys/fs/kdbus/"UID_FMT"
-user/bus"
-#ifndef TTY_GID
-#define TTY_GID 5
-#endif
+#define PLYMOUTH_SOCKET { \
+ .un.sun_family = AF_UNIX, \
+ .un.sun_path = "\0/org/freedesktop/plymouthd", \
+ }
+
+#define NOTIFY_FD_MAX 768
+#define NOTIFY_BUFFER_MAX PIPE_BUF