chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: rework how we flush incoming traffic when a socket unit goes down
[elogind.git]
/
src
/
basic
/
log.c
diff --git
a/src/basic/log.c
b/src/basic/log.c
index ca12c8b4133c5fdc10be7a84dd360e0e789f123f..08aa986a0ec3f3826a27a645ca4c4502fe16ce07 100644
(file)
--- a/
src/basic/log.c
+++ b/
src/basic/log.c
@@
-165,7
+165,7
@@
static int log_open_syslog(void) {
goto fail;
}
goto fail;
}
- if (connect(syslog_fd, &sa.sa,
offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path
)) < 0) {
+ if (connect(syslog_fd, &sa.sa,
SOCKADDR_UN_LEN(sa.un
)) < 0) {
safe_close(syslog_fd);
/* Some legacy syslog systems still use stream
safe_close(syslog_fd);
/* Some legacy syslog systems still use stream
@@
-177,7
+177,7
@@
static int log_open_syslog(void) {
goto fail;
}
goto fail;
}
- if (connect(syslog_fd, &sa.sa,
offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path
)) < 0) {
+ if (connect(syslog_fd, &sa.sa,
SOCKADDR_UN_LEN(sa.un
)) < 0) {
r = -errno;
goto fail;
}
r = -errno;
goto fail;
}
@@
-216,7
+216,7
@@
static int log_open_journal(void) {
goto fail;
}
goto fail;
}
- if (connect(journal_fd, &sa.sa,
offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path
)) < 0) {
+ if (connect(journal_fd, &sa.sa,
SOCKADDR_UN_LEN(sa.un
)) < 0) {
r = -errno;
goto fail;
}
r = -errno;
goto fail;
}