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: disarm shutdown watchdog if we fail to set timeout
[elogind.git]
/
src
/
network
/
networkd-network.c
diff --git
a/src/network/networkd-network.c
b/src/network/networkd-network.c
index 9ebc2d15aaecd6bb0e6d28060c8c042e3d92397d..c90f730f108b51c1d32e689f908b60a63ac322a7 100644
(file)
--- a/
src/network/networkd-network.c
+++ b/
src/network/networkd-network.c
@@
-196,10
+196,10
@@
void network_free(Network *network) {
free(network->filename);
free(network->match_mac);
free(network->filename);
free(network->match_mac);
- free(network->match_path);
- free(network->match_driver);
- free(network->match_type);
- free(network->match_name);
+
strv_
free(network->match_path);
+
strv_
free(network->match_driver);
+
strv_
free(network->match_type);
+
strv_
free(network->match_name);
free(network->description);
free(network->dhcp_vendor_class_identifier);
free(network->description);
free(network->dhcp_vendor_class_identifier);
@@
-680,12
+680,12
@@
int config_parse_token(
r = in_addr_is_null(AF_INET6, &buffer);
if (r < 0) {
r = in_addr_is_null(AF_INET6, &buffer);
if (r < 0) {
- log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token can
no
t be the ANY address, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, -r, "IPv6 token can
no
t be the ANY address, ignoring: %s", rvalue);
return 0;
}
if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
return 0;
}
if ((buffer.in6.s6_addr32[0] | buffer.in6.s6_addr32[1]) != 0) {
- log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token can
no
t be longer than 64 bits, ignoring: %s", rvalue);
+ log_syntax(unit, LOG_ERR, filename, line, EINVAL, "IPv6 token can
no
t be longer than 64 bits, ignoring: %s", rvalue);
return 0;
}
return 0;
}