picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

bus: reuse sd_is_socket() call

Browse source
This commit is contained in:
Lennart Poettering 2013-03-31 20:19:44 +02:00
parent 15d5af8145
commit 9ab32f9daa
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -1689,7 +1689,8 @@ libsystemd_bus_la_SOURCES = \
libsystemd_bus_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-shared.la
libsystemd-shared.la \
libsystemd-daemon.la
noinst_LTLIBRARIES += \
libsystemd-bus.la

15
src/libsystemd-bus/bus-socket.c
View file

@ -31,6 +31,7 @@
#include "missing.h"
#include "strv.h"
#include "utf8.h"
#include "sd-daemon.h"
#include "sd-bus.h"
#include "bus-socket.h"
@ -589,25 +590,17 @@ static int bus_socket_start_auth_client(sd_bus *b) {
}
static int bus_socket_start_auth(sd_bus *b) {
int domain = 0, r;
socklen_t sl;
assert(b);
b->state = BUS_AUTHENTICATING;
b->auth_timeout = now(CLOCK_MONOTONIC) + BUS_DEFAULT_TIMEOUT;
sl = sizeof(domain);
r = getsockopt(b->input_fd, SOL_SOCKET, SO_DOMAIN, &domain, &sl);
if (r < 0 || domain != AF_UNIX)
if (sd_is_socket(b->input_fd, AF_UNIX, 0, 0) <= 0)
b->negotiate_fds = false;
if (b->output_fd != b->input_fd) {
r = getsockopt(b->output_fd, SOL_SOCKET, SO_DOMAIN, &domain, &sl);
if (r < 0 || domain != AF_UNIX)
if (b->output_fd != b->input_fd)
if (sd_is_socket(b->output_fd, AF_UNIX, 0, 0) <= 0)
b->negotiate_fds = false;
}
if (b->is_server)
return bus_socket_read_auth(b);