Compare commits
No commits in common. "0e97a910a63d338f0acce6302de76b3e96c9cd70" and "a26c307320fbc317dcb9c8f34d5876faa3a1a3cb" have entirely different histories.
0e97a910a6
...
a26c307320
|
@ -239,11 +239,12 @@ if conf.get('ENABLE_NETWORKD') == 1
|
||||||
test_tables_h],
|
test_tables_h],
|
||||||
[libnetworkd_core,
|
[libnetworkd_core,
|
||||||
libudev_static,
|
libudev_static,
|
||||||
|
libudev_core,
|
||||||
libsystemd_network,
|
libsystemd_network,
|
||||||
libshared],
|
libshared],
|
||||||
[threads],
|
[threads],
|
||||||
'', '', [],
|
'', '', [],
|
||||||
[network_include_dir]],
|
[network_include_dir] + libudev_core_includes],
|
||||||
|
|
||||||
[['src/network/generator/test-network-generator.c',
|
[['src/network/generator/test-network-generator.c',
|
||||||
'src/network/generator/network-generator.c',
|
'src/network/generator/network-generator.c',
|
||||||
|
|
|
@ -695,8 +695,8 @@ int manager_rtnl_process_neighbor(sd_netlink *rtnl, sd_netlink_message *message,
|
||||||
strnull(addr_str), strnull(lladdr_str));
|
strnull(addr_str), strnull(lladdr_str));
|
||||||
(void) neighbor_free(neighbor);
|
(void) neighbor_free(neighbor);
|
||||||
} else
|
} else
|
||||||
log_link_debug(link, "Kernel removed a neighbor we don't remember: %s->%s, ignoring.",
|
log_link_info(link, "Kernel removed a neighbor we don't remember: %s->%s, ignoring.",
|
||||||
strnull(addr_str), strnull(lladdr_str));
|
strnull(addr_str), strnull(lladdr_str));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -855,9 +855,9 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
|
||||||
valid_str ? "for " : "forever", strempty(valid_str));
|
valid_str ? "for " : "forever", strempty(valid_str));
|
||||||
(void) address_drop(address);
|
(void) address_drop(address);
|
||||||
} else
|
} else
|
||||||
log_link_debug(link, "Kernel removed an address we don't remember: %s/%u (valid %s%s), ignoring.",
|
log_link_info(link, "Kernel removed an address we don't remember: %s/%u (valid %s%s), ignoring.",
|
||||||
strnull(buf), prefixlen,
|
strnull(buf), prefixlen,
|
||||||
valid_str ? "for " : "forever", strempty(valid_str));
|
valid_str ? "for " : "forever", strempty(valid_str));
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
@ -218,7 +218,7 @@ int pkcs11_token_login(
|
||||||
r = asprintf(&text,
|
r = asprintf(&text,
|
||||||
"Please enter correct PIN for security token '%s' in order to unlock %s (final try):",
|
"Please enter correct PIN for security token '%s' in order to unlock %s (final try):",
|
||||||
token_label, friendly_name);
|
token_label, friendly_name);
|
||||||
else if (FLAGS_SET(token_info->flags, CKF_USER_PIN_COUNT_LOW))
|
if (FLAGS_SET(token_info->flags, CKF_USER_PIN_COUNT_LOW))
|
||||||
r = asprintf(&text,
|
r = asprintf(&text,
|
||||||
"PIN has been entered incorrectly previously, please enter correct PIN for security token '%s' in order to unlock %s:",
|
"PIN has been entered incorrectly previously, please enter correct PIN for security token '%s' in order to unlock %s:",
|
||||||
token_label, friendly_name);
|
token_label, friendly_name);
|
||||||
|
|
Loading…
Reference in New Issue