chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: create private subdirectory for X11 socket
[elogind.git]
/
src
/
socket.c
diff --git
a/src/socket.c
b/src/socket.c
index 1020c94de233ff390d6edfb2c9de1348623e1a56..8b78a3fd25a0644d961feef1284fcb212370ec56 100644
(file)
--- a/
src/socket.c
+++ b/
src/socket.c
@@
-131,7
+131,7
@@
static void socket_done(Unit *u) {
unit_unwatch_timer(u, &s->timer_watch);
/* Make sure no service instance refers to us anymore. */
unit_unwatch_timer(u, &s->timer_watch);
/* Make sure no service instance refers to us anymore. */
- LIST_FOREACH(units_
per_type, i, u->meta.manager->units_per
_type[UNIT_SERVICE]) {
+ LIST_FOREACH(units_
by_type, i, u->meta.manager->units_by
_type[UNIT_SERVICE]) {
Service *service = (Service *) i;
if (service->accept_socket == s)
Service *service = (Service *) i;
if (service->accept_socket == s)
@@
-283,7
+283,7
@@
static int socket_add_mount_links(Socket *s) {
assert(s);
assert(s);
- LIST_FOREACH(units_
per_type, other, s->meta.manager->units_per
_type[UNIT_MOUNT])
+ LIST_FOREACH(units_
by_type, other, s->meta.manager->units_by
_type[UNIT_MOUNT])
if ((r = socket_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
if ((r = socket_add_one_mount_link(s, (Mount*) other)) < 0)
return r;
@@
-663,14
+663,14
@@
static void socket_apply_socket_options(Socket *s, int fd) {
if (s->receive_buffer > 0) {
int value = (int) s->receive_buffer;
if (s->receive_buffer > 0) {
int value = (int) s->receive_buffer;
- if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, &value, sizeof(value)) < 0)
- log_warning("SO_RCVBUF failed: %m");
+ if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF
FORCE
, &value, sizeof(value)) < 0)
+ log_warning("SO_RCVBUF
FORCE
failed: %m");
}
if (s->send_buffer > 0) {
int value = (int) s->send_buffer;
}
if (s->send_buffer > 0) {
int value = (int) s->send_buffer;
- if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, &value, sizeof(value)) < 0)
- log_warning("SO_SNDBUF failed: %m");
+ if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF
FORCE
, &value, sizeof(value)) < 0)
+ log_warning("SO_SNDBUF
FORCE
failed: %m");
}
if (s->mark >= 0)
}
if (s->mark >= 0)
@@
-1361,7
+1361,7
@@
static void socket_enter_running(Socket *s, int cfd) {
/* If there's already a start pending don't bother to
* do anything */
/* If there's already a start pending don't bother to
* do anything */
- LIST_FOREACH(units_
per_type, i, s->meta.manager->units_per
_type[UNIT_SERVICE]) {
+ LIST_FOREACH(units_
by_type, i, s->meta.manager->units_by
_type[UNIT_SERVICE]) {
Service *service = (Service *) i;
if (!set_get(service->configured_sockets, s))
Service *service = (Service *) i;
if (!set_get(service->configured_sockets, s))