chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
resolved: fix typo in log message
[elogind.git]
/
src
/
resolve
/
resolved-manager.c
diff --git
a/src/resolve/resolved-manager.c
b/src/resolve/resolved-manager.c
index 04ee204074107d54dc2e99c6d90acfa0f4b2d866..f97989754d5594a087cf89e6595e7664ab341fd3 100644
(file)
--- a/
src/resolve/resolved-manager.c
+++ b/
src/resolve/resolved-manager.c
@@
-449,7
+449,7
@@
static int manager_llmnr_start(Manager *m) {
return 0;
eaddrinuse:
return 0;
eaddrinuse:
- log_warning("There appears to be another LLMNR responder
ing
running. Turning off LLMNR support.");
+ log_warning("There appears to be another LLMNR responder running. Turning off LLMNR support.");
m->llmnr_support = SUPPORT_NO;
manager_llmnr_stop(m);
m->llmnr_support = SUPPORT_NO;
manager_llmnr_stop(m);
@@
-699,7
+699,7
@@
static void write_resolv_conf_server(DnsServer *s, FILE *f, unsigned *count) {
}
static void write_resolv_conf_search(const char *domain, FILE *f,
}
static void write_resolv_conf_search(const char *domain, FILE *f,
- unsigned *
length, unsigned *count
) {
+ unsigned *
count, unsigned *length
) {
assert(domain);
assert(f);
assert(length);
assert(domain);
assert(f);
assert(length);
@@
-841,7
+841,7
@@
int manager_recv(Manager *m, int fd, DnsProtocol protocol, DnsPacket **ret) {
_cleanup_(dns_packet_unrefp) DnsPacket *p = NULL;
union {
struct cmsghdr header; /* For alignment */
_cleanup_(dns_packet_unrefp) DnsPacket *p = NULL;
union {
struct cmsghdr header; /* For alignment */
- uint8_t buffer[CMSG_SPACE(
CONST_MAX(sizeof(struct in_pktinfo), sizeof(struct in6_pktinfo)
))
+ uint8_t buffer[CMSG_SPACE(
MAXSIZE(struct in_pktinfo, struct in6_pktinfo
))
+ CMSG_SPACE(int) /* ttl/hoplimit */
+ EXTRA_CMSG_SPACE /* kernel appears to require extra buffer space */];
} control;
+ CMSG_SPACE(int) /* ttl/hoplimit */
+ EXTRA_CMSG_SPACE /* kernel appears to require extra buffer space */];
} control;