diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-03 19:49:40 -0500 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-07-18 21:44:59 -0400 |
| commit | 6b9732b2bf0499c5e4ea8a9d4f6051d98033f680 (patch) | |
| tree | ab1b52d98a5370d8a75f83fdcdd56fd936cfe946 | |
| parent | 3fb97a58fa3f233cc980cdc4ae33230a361b3c34 (diff) | |
Be more verbose when bind or listen fails
Also be more verbose in devnode_acl_all().
| -rw-r--r-- | src/core/manager.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-native.c | 2 | ||||
| -rw-r--r-- | src/journal/journald-stream.c | 4 | ||||
| -rw-r--r-- | src/journal/journald-syslog.c | 2 | ||||
| -rw-r--r-- | src/login/logind-acl.c | 5 | ||||
| -rw-r--r-- | src/shared/ask-password-api.c | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index e7a3a2a193..9d9a713005 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -554,7 +554,7 @@ static int manager_setup_notify(Manager *m) { strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1); r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); if (r < 0) { - log_error("bind() failed: %m"); + log_error("bind(@%s) failed: %m", sa.un.sun_path+1); return -errno; } diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c index 6674f3bd50..0f3936a146 100644 --- a/src/journal/journald-native.c +++ b/src/journal/journald-native.c @@ -404,7 +404,7 @@ int server_open_native_socket(Server*s) { r = bind(s->native_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); if (r < 0) { - log_error("bind() failed: %m"); + log_error("bind(%s) failed: %m", sa.un.sun_path); return -errno; } diff --git a/src/journal/journald-stream.c b/src/journal/journald-stream.c index 89da150a60..8a983d84d9 100644 --- a/src/journal/journald-stream.c +++ b/src/journal/journald-stream.c @@ -450,14 +450,14 @@ int server_open_stdout_socket(Server *s) { r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); if (r < 0) { - log_error("bind() failed: %m"); + log_error("bind(%s) failed: %m", sa.un.sun_path); return -errno; } chmod(sa.un.sun_path, 0666); if (listen(s->stdout_fd, SOMAXCONN) < 0) { - log_error("listen() failed: %m"); + log_error("listen(%s) failed: %m", sa.un.sun_path); return -errno; } } else diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c index afeb8bd129..656dc72bb9 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -441,7 +441,7 @@ int server_open_syslog_socket(Server *s) { r = bind(s->syslog_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path)); if (r < 0) { - log_error("bind() failed: %m"); + log_error("bind(%s) failed: %m", sa.un.sun_path); return -errno; } diff --git a/src/login/logind-acl.c b/src/login/logind-acl.c index 4bbeb64e8b..af7c352ce5 100644 --- a/src/login/logind-acl.c +++ b/src/login/logind-acl.c @@ -277,7 +277,10 @@ int devnode_acl_all(struct udev *udev, SET_FOREACH(n, nodes, i) { int k; - log_debug("Fixing up ACLs at %s for seat %s", n, seat); + log_debug("Changing ACLs at %s for seat %s (uid "UID_FMT"→"UID_FMT"%s%s)", + n, seat, old_uid, new_uid, + del ? " del" : "", add ? " add" : ""); + k = devnode_acl(n, flush, del, old_uid, add, new_uid); if (k == -ENOENT) log_debug("Device %s disappeared while setting ACLs", n); diff --git a/src/shared/ask-password-api.c b/src/shared/ask-password-api.c index 5997a03fb2..8d03f4ad09 100644 --- a/src/shared/ask-password-api.c +++ b/src/shared/ask-password-api.c @@ -270,7 +270,7 @@ static int create_socket(char **name) { if (r < 0) { r = -errno; - log_error("bind() failed: %m"); + log_error("bind(%s) failed: %m", sa.un.sun_path); goto fail; } |