diff options
| author | Michael Biebl <biebl@debian.org> | 2023-06-12 11:26:40 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2023-06-12 11:26:40 +0200 |
| commit | 0201cd4d5f16d814abbd0c04dc53a39fc1e9bf8c (patch) | |
| tree | 1d7c2916d4e4ac9396e6c561efd1ccb0998a1949 /src/core/nm-core-utils.c | |
| parent | 12e1ee797bbf0b10d1fd5afd4b947484769f2b9f (diff) | |
| parent | 150fe9eef8dd22307ee16687509acde616663982 (diff) | |
Update upstream source from tag 'upstream/1.42.6'
Update to upstream version '1.42.6' with Debian dir 8be9ac7ed401d9957f945770395562546a320da3
Diffstat (limited to 'src/core/nm-core-utils.c')
| -rw-r--r-- | src/core/nm-core-utils.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 500bffb9..28d9a788 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -3673,9 +3673,7 @@ _hw_addr_eth_complete(struct ether_addr *addr, nm_assert((ouis == NULL) ^ (ouis_len != 0)); if (ouis) { - /* g_random_int() is good enough here. It uses a static GRand instance - * that is seeded from /dev/urandom. */ - oui = ouis[g_random_int() % ouis_len]; + oui = ouis[nm_random_u64_range(ouis_len)]; g_free(ouis); } else { if (!nm_utils_hwaddr_aton(current_mac_address, &oui, ETH_ALEN)) @@ -5156,11 +5154,11 @@ nm_utils_spawn_helper(const char *const *args, g_source_attach(info->timeout_source, g_main_context_get_thread_default()); /* Set file descriptors as non-blocking */ - fd_flags = fcntl(info->child_stdin, F_GETFD, 0); + fd_flags = fcntl(info->child_stdin, F_GETFL, 0); fcntl(info->child_stdin, F_SETFL, fd_flags | O_NONBLOCK); - fd_flags = fcntl(info->child_stdout, F_GETFD, 0); + fd_flags = fcntl(info->child_stdout, F_GETFL, 0); fcntl(info->child_stdout, F_SETFL, fd_flags | O_NONBLOCK); - fd_flags = fcntl(info->child_stderr, F_GETFD, 0); + fd_flags = fcntl(info->child_stderr, F_GETFL, 0); fcntl(info->child_stderr, F_SETFL, fd_flags | O_NONBLOCK); /* Watch process stdin */ |