From e874c5bf6b7819adc1c1bb7ae2cec60f8ec511a2 Mon Sep 17 00:00:00 2001 From: Lukasz Majewski Date: Wed, 7 Jul 2021 12:52:10 +0200 Subject: [PATCH] random: Provide missing gettid() declaration Provide missing declaration of gettid() function necessary for entropy generation for hash table in the _rand_init_seed() function in the src/libnm-glib-aux/nm-random-utils.c. Fixes: 3649efe2b574 ('glib-aux: put more effort into seeding GRand fallback for nm_utils_random_bytes()') https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/754 https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/918 --- src/libnm-glib-aux/nm-shared-utils.h | 10 ++++++++++ .../sd-adapt-shared/nm-sd-adapt-shared.h | 7 ------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/libnm-glib-aux/nm-shared-utils.h b/src/libnm-glib-aux/nm-shared-utils.h index 06b7e164fa..1c59dcaae9 100644 --- a/src/libnm-glib-aux/nm-shared-utils.h +++ b/src/libnm-glib-aux/nm-shared-utils.h @@ -30,6 +30,16 @@ nm_is_ascii(char ch) /*****************************************************************************/ +#include +static inline pid_t +_nm_gettid(void) +{ + return (pid_t) syscall(SYS_gettid); +} +#define gettid() _nm_gettid() + +/*****************************************************************************/ + pid_t nm_utils_gettid(void); gboolean _nm_assert_on_main_thread(void); diff --git a/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h index 9d4669c33f..fb31962295 100644 --- a/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/src/libnm-systemd-shared/sd-adapt-shared/nm-sd-adapt-shared.h @@ -75,13 +75,6 @@ raw_getpid(void) #endif } -static inline pid_t -_nm_gettid(void) -{ - return (pid_t) syscall(SYS_gettid); -} - #define gettid() _nm_gettid() - /* we build with C11 and thus provides char32_t,char16_t. */ #define HAVE_CHAR32_T 1 #define HAVE_CHAR16_T 1