chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
device: be more verbose of udev confuses us
[elogind.git]
/
src
/
socket-util.c
diff --git
a/src/socket-util.c
b/src/socket-util.c
index 3a00fcf43f1289c728d5566ecedaf16dcdbcf95e..151757c52bdd6d84d945a52552c8d69041c60bd1 100644
(file)
--- a/
src/socket-util.c
+++ b/
src/socket-util.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-29,12
+29,12
@@
#include <net/if.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <net/if.h>
#include <sys/types.h>
#include <sys/stat.h>
-#include <selinux/selinux.h>
#include "macro.h"
#include "util.h"
#include "socket-util.h"
#include "missing.h"
#include "macro.h"
#include "util.h"
#include "socket-util.h"
#include "missing.h"
+#include "label.h"
int socket_address_parse(SocketAddress *a, const char *s) {
int r;
int socket_address_parse(SocketAddress *a, const char *s) {
int r;
@@
-306,7
+306,7
@@
int socket_address_listen(
bool free_bind,
mode_t directory_mode,
mode_t socket_mode,
bool free_bind,
mode_t directory_mode,
mode_t socket_mode,
-
security_context_t scon
,
+
const char *label
,
int *ret) {
int r, fd, one;
int *ret) {
int r, fd, one;
@@
-316,16
+316,14
@@
int socket_address_listen(
if ((r = socket_address_verify(a)) < 0)
return r;
if ((r = socket_address_verify(a)) < 0)
return r;
- if (setsockcreatecon(scon) < 0) {
- log_error("Failed to set SELinux context (%s) on socket: %m", scon);
- if (security_getenforce() == 1)
- return -errno;
- }
+ r = label_socket_set(label);
+ if (r < 0)
+ return r;
fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
r = fd < 0 ? -errno : 0;
fd = socket(socket_address_family(a), a->type | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
r = fd < 0 ? -errno : 0;
-
setsockcreatecon(NULL
);
+
label_socket_clear(
);
if (r < 0)
return r;
if (r < 0)
return r;