chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dbus: allow LoadUnit to unprivileged users
[elogind.git]
/
src
/
kmsg-syslogd.c
diff --git
a/src/kmsg-syslogd.c
b/src/kmsg-syslogd.c
index f5c8e7121d19a7a48fdf5aa1420a85519e0643ee..c78011fe226d56cf06e1a067646358d27f4a55b4 100644
(file)
--- a/
src/kmsg-syslogd.c
+++ b/
src/kmsg-syslogd.c
@@
-39,7
+39,6
@@
#include "fdset.h"
#define SERVER_FD_MAX 16
#include "fdset.h"
#define SERVER_FD_MAX 16
-#define TIMEOUT ((int) (10*MSEC_PER_SEC))
typedef struct Stream Stream;
typedef struct Stream Stream;
@@
-355,7
+354,9
@@
static int write_message(Server *s, const char *buf, struct ucred *ucred) {
/* Then, add process if set */
if (read_process(&buf, &iovec[i]) > 0)
i++;
/* Then, add process if set */
if (read_process(&buf, &iovec[i]) > 0)
i++;
- else if (ucred && get_process_name(ucred->pid, &process) >= 0)
+ else if (ucred &&
+ ucred->pid > 0 &&
+ get_process_name(ucred->pid, &process) >= 0)
IOVEC_SET_STRING(iovec[i++], process);
/* Skip the stored PID if we have a better one */
IOVEC_SET_STRING(iovec[i++], process);
/* Skip the stored PID if we have a better one */
@@
-473,16
+474,16
@@
static int process_event(Server *s, struct epoll_event *ev) {
int main(int argc, char *argv[]) {
Server server;
int main(int argc, char *argv[]) {
Server server;
- int r =
3
, n;
+ int r =
EXIT_FAILURE
, n;
if (getppid() != 1) {
log_error("This program should be invoked by init only.");
if (getppid() != 1) {
log_error("This program should be invoked by init only.");
- return
1
;
+ return
EXIT_FAILURE
;
}
if (argc > 1) {
log_error("This program does not take arguments.");
}
if (argc > 1) {
log_error("This program does not take arguments.");
- return
1
;
+ return
EXIT_FAILURE
;
}
log_set_target(LOG_TARGET_KMSG);
}
log_set_target(LOG_TARGET_KMSG);
@@
-491,16
+492,16
@@
int main(int argc, char *argv[]) {
if ((n = sd_listen_fds(true)) < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
if ((n = sd_listen_fds(true)) < 0) {
log_error("Failed to read listening file descriptors from environment: %s", strerror(-r));
- return
1
;
+ return
EXIT_FAILURE
;
}
if (n <= 0 || n > SERVER_FD_MAX) {
log_error("No or too many file descriptors passed.");
}
if (n <= 0 || n > SERVER_FD_MAX) {
log_error("No or too many file descriptors passed.");
- return
2
;
+ return
EXIT_FAILURE
;
}
if (server_init(&server, (unsigned) n) < 0)
}
if (server_init(&server, (unsigned) n) < 0)
- return
3
;
+ return
EXIT_FAILURE
;
log_debug("systemd-kmsg-syslogd running as pid %lu", (unsigned long) getpid());
log_debug("systemd-kmsg-syslogd running as pid %lu", (unsigned long) getpid());
@@
-512,7
+513,7
@@
int main(int argc, char *argv[]) {
struct epoll_event event;
int k;
struct epoll_event event;
int k;
- if ((k = epoll_wait(server.epoll_fd, &event, 1,
TIMEOUT
)) < 0) {
+ if ((k = epoll_wait(server.epoll_fd, &event, 1,
-1
)) < 0) {
if (errno == EINTR)
continue;
if (errno == EINTR)
continue;
@@
-531,7
+532,7
@@
int main(int argc, char *argv[]) {
break;
}
break;
}
- r =
0
;
+ r =
EXIT_SUCCESS
;
log_debug("systemd-kmsg-syslogd stopped as pid %lu", (unsigned long) getpid());
log_debug("systemd-kmsg-syslogd stopped as pid %lu", (unsigned long) getpid());