morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

Small modernizations

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-07-18 14:01:13 -04:00
parent 6b9732b2bf
commit f7a5bb2842
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/journal/coredumpctl.c
View File

@@ -131,11 +131,10 @@ static int add_match(Set *set, const char *match) {
goto fail;
log_debug("Adding pattern: %s", pattern);
r = set_put(set, pattern);
r = set_consume(set, pattern);
if (r < 0) {
log_error("Failed to add pattern '%s': %s",
pattern, strerror(-r));
free(pattern);
goto fail;
}

9
src/journal/journald-native.c
View File

@@ -383,12 +383,15 @@ void server_process_native_file(
}
int server_open_native_socket(Server*s) {
union sockaddr_union sa;
int one, r;
assert(s);
if (s->native_fd < 0) {
union sockaddr_union sa = {
.un.sun_family = AF_UNIX,
.un.sun_path = "/run/systemd/journal/socket",
};
s->native_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
if (s->native_fd < 0) {
@@ -396,10 +399,6 @@ int server_open_native_socket(Server*s) {
return -errno;
}
zero(sa);
sa.un.sun_family = AF_UNIX;
strncpy(sa.un.sun_path, "/run/systemd/journal/socket", sizeof(sa.un.sun_path));
unlink(sa.un.sun_path);
r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));

2
src/login/logind-acl.c
View File

@@ -284,7 +284,7 @@ int devnode_acl_all(struct udev *udev,
k = devnode_acl(n, flush, del, old_uid, add, new_uid);
if (k == -ENOENT)
log_debug("Device %s disappeared while setting ACLs", n);
else if (k < 0)
else if (k < 0 && r == 0)
r = k;
}

2
src/login/logind-session.h
View File

@@ -72,7 +72,7 @@ enum KillWho {
struct Session {
Manager *manager;
char *id;
const char *id;
unsigned int pos;
SessionType type;
SessionClass class;