fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 08:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns: fix _NMLOG() macro

Browse source 
The buffer was too small to contain _NMLOG_PREFIX_NAME and the pointer,
resulting in truncated messages like:

  dns-mgr[0x561d1183d: set resolv-conf-mode: none
This commit is contained in:
Thomas Haller 2016-03-22 11:00:54 +01:00
parent 3bcc0e5cea
commit 4faaa3eb0b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/dns-manager/nm-dns-manager.c
View file

@ -100,14 +100,11 @@ NM_DEFINE_SINGLETON_INSTANCE (NMDnsManager);
const NMDnsManager *const __self = (self); \ const NMDnsManager *const __self = (self); \
\ \
_nm_log (__level, _NMLOG_DOMAIN, 0, \ _nm_log (__level, _NMLOG_DOMAIN, 0, \
"%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \ "%s%s: " _NM_UTILS_MACRO_FIRST (__VA_ARGS__), \
((__self == singleton_instance) \ _NMLOG_PREFIX_NAME, \
? _NMLOG_PREFIX_NAME \ ((!__self || __self == singleton_instance) \
: ({ \ ? "" \
g_snprintf (__prefix, sizeof (__prefix), "%s[%p]", _NMLOG_PREFIX_NAME, __self); \ : nm_sprintf_buf (__prefix, "[%p]", __self)) \
__prefix; \
}) \
) \
_NM_UTILS_MACRO_REST (__VA_ARGS__)); \ _NM_UTILS_MACRO_REST (__VA_ARGS__)); \
} \ } \
} G_STMT_END } G_STMT_END