chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: make requirement for ACLs optional
[elogind.git]
/
src
/
journal
/
journal-send.c
diff --git
a/src/journal/journal-send.c
b/src/journal/journal-send.c
index 176aac2792d4b77b0d49091e7ee76ce518aa7d26..ddf503b18d72663c30de53e6dcb98ac620fa8139 100644
(file)
--- a/
src/journal/journal-send.c
+++ b/
src/journal/journal-send.c
@@
-209,7
+209,7
@@
_public_ int sd_journal_sendv(const struct iovec *iov, int n) {
return 0;
}
return 0;
}
-_public_ int sd_journal_stream_fd(const char *
tag, int priority, int priority
_prefix) {
+_public_ int sd_journal_stream_fd(const char *
identifier, int priority, int level
_prefix) {
union sockaddr_union sa;
int fd;
char *header;
union sockaddr_union sa;
int fd;
char *header;
@@
-233,17
+233,22
@@
_public_ int sd_journal_stream_fd(const char *tag, int priority, int priority_pr
return -errno;
}
return -errno;
}
- if (!tag)
- tag = "";
+ if (shutdown(fd, SHUT_RD) < 0) {
+ close_nointr_nofail(fd);
+ return -errno;
+ }
+
+ if (!identifier)
+ identifier = "";
- l = strlen(
tag
);
+ l = strlen(
identifier
);
header = alloca(l + 1 + 2 + 2 + 2 + 2 + 2);
header = alloca(l + 1 + 2 + 2 + 2 + 2 + 2);
- memcpy(header,
tag
, l);
+ memcpy(header,
identifier
, l);
header[l++] = '\n';
header[l++] = '0' + priority;
header[l++] = '\n';
header[l++] = '\n';
header[l++] = '0' + priority;
header[l++] = '\n';
- header[l++] = '0' + !!
priority
_prefix;
+ header[l++] = '0' + !!
level
_prefix;
header[l++] = '\n';
header[l++] = '0';
header[l++] = '\n';
header[l++] = '\n';
header[l++] = '0';
header[l++] = '\n';