chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: move ManagerRunningAs to shared
[elogind.git]
/
src
/
core
/
socket.c
diff --git
a/src/core/socket.c
b/src/core/socket.c
index 837b166e3bdac367e144634218d92a5b34a776ce..26e7fd24de7c7ebcf0770d0390a8c3221d5b9822 100644
(file)
--- a/
src/core/socket.c
+++ b/
src/core/socket.c
@@
-39,6
+39,7
@@
#include "mkdir.h"
#include "path-util.h"
#include "unit-name.h"
#include "mkdir.h"
#include "path-util.h"
#include "unit-name.h"
+#include "unit-printf.h"
#include "dbus-socket.h"
#include "missing.h"
#include "special.h"
#include "dbus-socket.h"
#include "missing.h"
#include "special.h"
@@
-305,7
+306,7
@@
static int socket_add_default_dependencies(Socket *s) {
int r;
assert(s);
int r;
assert(s);
- if (UNIT(s)->manager->running_as ==
MANAGER
_SYSTEM) {
+ if (UNIT(s)->manager->running_as ==
SYSTEMD
_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(s), UNIT_BEFORE, SPECIAL_SOCKETS_TARGET, NULL, true)) < 0)
return r;
@@
-584,7
+585,7
@@
static int instance_from_socket(int fd, unsigned nr, char **instance) {
}
case AF_INET6: {
}
case AF_INET6: {
- static const char ipv4_prefix[] = {
+ static const
unsigned
char ipv4_prefix[] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF
};
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF
};
@@
-1850,7
+1851,8
@@
static void socket_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
if (w->socket_accept) {
for (;;) {
if (w->socket_accept) {
for (;;) {
- if ((cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK)) < 0) {
+ cfd = accept4(fd, NULL, NULL, SOCK_NONBLOCK);
+ if (cfd < 0) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
@@
-1884,7
+1886,7
@@
static void socket_sigchld_event(Unit *u, pid_t pid, int code, int status) {
s->control_pid = 0;
s->control_pid = 0;
- if (is_clean_exit(code, status))
+ if (is_clean_exit(code, status
, NULL
))
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;
f = SOCKET_SUCCESS;
else if (code == CLD_EXITED)
f = SOCKET_FAILURE_EXIT_CODE;
@@
-2194,6
+2196,8
@@
DEFINE_STRING_TABLE_LOOKUP(socket_result, SocketResult);
const UnitVTable socket_vtable = {
.object_size = sizeof(Socket),
const UnitVTable socket_vtable = {
.object_size = sizeof(Socket),
+ .exec_context_offset = offsetof(Socket, exec_context),
+
.sections =
"Unit\0"
"Socket\0"
.sections =
"Unit\0"
"Socket\0"