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: set LLMNR TCP and UDP TTLs to the values suggested by the RFC
[elogind.git]
/
src
/
machine
/
machinectl.c
diff --git
a/src/machine/machinectl.c
b/src/machine/machinectl.c
index 04c7c7c670213282258b207303de50274576f667..574c988e82babca5add01d6bdf430d90bd4ecdaf 100644
(file)
--- a/
src/machine/machinectl.c
+++ b/
src/machine/machinectl.c
@@
-188,17
+188,17
@@
static int print_addresses(sd_bus *bus, const char *name, int ifi, const char *p
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_message_enter_container(reply, 'a', "(
y
ay)");
+ r = sd_bus_message_enter_container(reply, 'a', "(
i
ay)");
if (r < 0)
return bus_log_parse_error(r);
if (r < 0)
return bus_log_parse_error(r);
- while ((r = sd_bus_message_enter_container(reply, 'r', "
y
ay")) > 0) {
-
unsigned char
family;
+ while ((r = sd_bus_message_enter_container(reply, 'r', "
i
ay")) > 0) {
+
int
family;
const void *a;
size_t sz;
char buffer[MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)];
const void *a;
size_t sz;
char buffer[MAX(INET6_ADDRSTRLEN, INET_ADDRSTRLEN)];
- r = sd_bus_message_read(reply, "
y
", &family);
+ r = sd_bus_message_read(reply, "
i
", &family);
if (r < 0)
return bus_log_parse_error(r);
if (r < 0)
return bus_log_parse_error(r);
@@
-376,6
+376,8
@@
static int map_netif(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_
r = sd_bus_message_read_array(m, SD_BUS_TYPE_INT32, &v, &l);
if (r < 0)
return r;
r = sd_bus_message_read_array(m, SD_BUS_TYPE_INT32, &v, &l);
if (r < 0)
return r;
+ if (r == 0)
+ return -EBADMSG;
i->n_netif = l / sizeof(int32_t);
i->netif = memdup(v, l);
i->n_netif = l / sizeof(int32_t);
i->netif = memdup(v, l);