ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Zbigniew Jędrzejewski-Szmek d743bb
From b2d91572a13de1cf5bdf78c3926b50cacc8a5dd3 Mon Sep 17 00:00:00 2001
Zbigniew Jędrzejewski-Szmek d743bb
From: Lennart Poettering <lennart@poettering.net>
Zbigniew Jędrzejewski-Szmek d743bb
Date: Mon, 22 May 2017 14:38:01 +0200
Zbigniew Jędrzejewski-Szmek d743bb
Subject: [PATCH] sd-dhcp: library code shouldn't log above LOG_DEBUG (#6001)
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
Let's downgrade the warning introduced by
Zbigniew Jędrzejewski-Szmek d743bb
955d99edc7991386a36e3d33924cc584931fde91 to debug, as we really
Zbigniew Jędrzejewski-Szmek d743bb
shouldn't log at more than debug level from library code.
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
(And while we are at it, print the MTU as the right (unsigned) type in
Zbigniew Jędrzejewski-Szmek d743bb
the format string.)
Zbigniew Jędrzejewski-Szmek d743bb
(cherry picked from commit 4dd53da97daf3f064149380b6ca9e53273d77d88)
Zbigniew Jędrzejewski-Szmek d743bb
---
Zbigniew Jędrzejewski-Szmek d743bb
 src/libsystemd-network/sd-dhcp-lease.c | 2 +-
Zbigniew Jędrzejewski-Szmek d743bb
 1 file changed, 1 insertion(+), 1 deletion(-)
Zbigniew Jędrzejewski-Szmek d743bb
Zbigniew Jędrzejewski-Szmek d743bb
diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c
Zbigniew Jędrzejewski-Szmek d743bb
index 565ec4cbe4..13dc6e4386 100644
Zbigniew Jędrzejewski-Szmek d743bb
--- a/src/libsystemd-network/sd-dhcp-lease.c
Zbigniew Jędrzejewski-Szmek d743bb
+++ b/src/libsystemd-network/sd-dhcp-lease.c
Zbigniew Jędrzejewski-Szmek d743bb
@@ -595,7 +595,7 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
Zbigniew Jędrzejewski-Szmek d743bb
                 if (r < 0)
Zbigniew Jędrzejewski-Szmek d743bb
                         log_debug_errno(r, "Failed to parse MTU, ignoring: %m");
Zbigniew Jędrzejewski-Szmek d743bb
                 if (lease->mtu < DHCP_DEFAULT_MIN_SIZE) {
Zbigniew Jędrzejewski-Szmek d743bb
-                        log_warning("MTU value of %d too small. Using default MTU value of %d instead.", lease->mtu, DHCP_DEFAULT_MIN_SIZE);
Zbigniew Jędrzejewski-Szmek d743bb
+                        log_debug("MTU value of %" PRIu16 " too small. Using default MTU value of %d instead.", lease->mtu, DHCP_DEFAULT_MIN_SIZE);
Zbigniew Jędrzejewski-Szmek d743bb
                         lease->mtu = DHCP_DEFAULT_MIN_SIZE;
Zbigniew Jędrzejewski-Szmek d743bb
                 }
Zbigniew Jędrzejewski-Szmek d743bb