summaryrefslogtreecommitdiff
path: root/src/journal/journald-native.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-02 21:46:42 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-03 21:51:28 +0100
commit3b3154df7e2773332bb814e167187367a0ccae4a (patch)
treea3c34ce14c37180f242243249a91b1031fa322f9 /src/journal/journald-native.c
parentf49481d0ca170ea567b46fde6c1c089b1dbb49cb (diff)
journald: constify all things!
Diffstat (limited to 'src/journal/journald-native.c')
-rw-r--r--src/journal/journald-native.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index ace8d5cbfd..3c60b22eaf 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -70,15 +70,15 @@ bool valid_user_field(const char *p, size_t l, bool allow_protected) {
return true;
}
-static bool allow_object_pid(struct ucred *ucred) {
+static bool allow_object_pid(const struct ucred *ucred) {
return ucred && ucred->uid == 0;
}
void server_process_native_message(
Server *s,
const void *buffer, size_t buffer_size,
- struct ucred *ucred,
- struct timeval *tv,
+ const struct ucred *ucred,
+ const struct timeval *tv,
const char *label, size_t label_len) {
struct iovec *iovec = NULL;
@@ -303,8 +303,8 @@ finish:
void server_process_native_file(
Server *s,
int fd,
- struct ucred *ucred,
- struct timeval *tv,
+ const struct ucred *ucred,
+ const struct timeval *tv,
const char *label, size_t label_len) {
struct stat st;
@@ -412,7 +412,8 @@ void server_process_native_file(
}
int server_open_native_socket(Server*s) {
- int one, r;
+ static const int one = 1;
+ int r;
assert(s);
@@ -440,7 +441,6 @@ int server_open_native_socket(Server*s) {
} else
fd_nonblock(s->native_fd, 1);
- one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
if (r < 0) {
log_error("SO_PASSCRED failed: %m");
@@ -449,14 +449,12 @@ int server_open_native_socket(Server*s) {
#ifdef HAVE_SELINUX
if (mac_selinux_use()) {
- one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_PASSSEC, &one, sizeof(one));
if (r < 0)
log_warning("SO_PASSSEC failed: %m");
}
#endif
- one = 1;
r = setsockopt(s->native_fd, SOL_SOCKET, SO_TIMESTAMP, &one, sizeof(one));
if (r < 0) {
log_error("SO_TIMESTAMP failed: %m");