mirror of
https://github.com/systemd/systemd
synced 2026-04-10 09:04:50 +02:00
Compare commits
No commits in common. "733caba3894274a3e53438677bea38a3aa48a458" and "f333ed27fac2472ef5ab0d6fb980eea8353ced8d" have entirely different histories.
733caba389
...
f333ed27fa
@ -775,7 +775,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!timezone_is_valid(tz, LOG_DEBUG)) {
|
if (!timezone_is_valid(tz, LOG_DEBUG)) {
|
||||||
log_debug("Timezone is not valid, ignoring.");
|
log_debug_errno(r, "Timezone is not valid, ignoring: %m");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1314,14 +1314,6 @@ int manager_rtnl_process_address(sd_netlink *rtnl, sd_netlink_message *message,
|
|||||||
}
|
}
|
||||||
|
|
||||||
r = sd_netlink_message_read_u32(message, IFA_FLAGS, &tmp->flags);
|
r = sd_netlink_message_read_u32(message, IFA_FLAGS, &tmp->flags);
|
||||||
if (r == -ENODATA) {
|
|
||||||
unsigned char flags;
|
|
||||||
|
|
||||||
/* For old kernels. */
|
|
||||||
r = sd_rtnl_message_addr_get_flags(message, &flags);
|
|
||||||
if (r >= 0)
|
|
||||||
tmp->flags = flags;
|
|
||||||
}
|
|
||||||
if (r < 0) {
|
if (r < 0) {
|
||||||
log_link_warning_errno(link, r, "rtnl: received address message without flags, ignoring: %m");
|
log_link_warning_errno(link, r, "rtnl: received address message without flags, ignoring: %m");
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@ -1646,6 +1646,7 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma
|
|||||||
Link *link = NULL;
|
Link *link = NULL;
|
||||||
uint32_t ifindex;
|
uint32_t ifindex;
|
||||||
uint16_t type;
|
uint16_t type;
|
||||||
|
unsigned char table;
|
||||||
size_t rta_len;
|
size_t rta_len;
|
||||||
int r;
|
int r;
|
||||||
|
|
||||||
@ -1784,8 +1785,6 @@ int manager_rtnl_process_route(sd_netlink *rtnl, sd_netlink_message *message, Ma
|
|||||||
|
|
||||||
r = sd_netlink_message_read_u32(message, RTA_TABLE, &tmp->table);
|
r = sd_netlink_message_read_u32(message, RTA_TABLE, &tmp->table);
|
||||||
if (r == -ENODATA) {
|
if (r == -ENODATA) {
|
||||||
unsigned char table;
|
|
||||||
|
|
||||||
r = sd_rtnl_message_route_get_table(message, &table);
|
r = sd_rtnl_message_route_get_table(message, &table);
|
||||||
if (r >= 0)
|
if (r >= 0)
|
||||||
tmp->table = table;
|
tmp->table = table;
|
||||||
|
|||||||
@ -177,6 +177,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
@ -184,6 +185,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
@ -193,6 +195,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
@ -200,6 +203,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm]],
|
libm]],
|
||||||
|
|
||||||
@ -207,6 +211,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm],
|
libm],
|
||||||
[], 'HAVE_OPENSSL_OR_GCRYPT'],
|
[], 'HAVE_OPENSSL_OR_GCRYPT'],
|
||||||
@ -215,6 +220,7 @@ tests += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm],
|
libm],
|
||||||
[], '', 'manual'],
|
[], '', 'manual'],
|
||||||
@ -225,6 +231,7 @@ fuzzers += [
|
|||||||
[libsystemd_resolve_core,
|
[libsystemd_resolve_core,
|
||||||
libshared],
|
libshared],
|
||||||
[lib_openssl_or_gcrypt,
|
[lib_openssl_or_gcrypt,
|
||||||
|
libgcrypt,
|
||||||
libgpg_error,
|
libgpg_error,
|
||||||
libm]],
|
libm]],
|
||||||
]
|
]
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user