diff options
author | Thomas Haller <thaller@redhat.com> | 2020-07-13 23:40:46 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2020-07-13 23:40:48 +0200 |
commit | 7b14686ae2b0d610661af1958062c5388c0cb6bf (patch) | |
tree | fc9be8c6b5758ca10fd59d28549f46d8a44f68a8 /shared/systemd | |
parent | 8582a5f356b758b9fc44f977fbad10132fcbd926 (diff) | |
parent | 5542275672672299860117f6cc3c5b8e234bd8dc (diff) | |
download | NetworkManager-1.27.1-dev.tar.gz |
release: bump version to 1.27.1 (development)1.27.1-dev
Diffstat (limited to 'shared/systemd')
-rw-r--r-- | shared/systemd/nm-sd-utils-shared.c | 2 | ||||
-rw-r--r-- | shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h | 2 | ||||
-rw-r--r-- | shared/systemd/src/basic/process-util.c | 2 | ||||
-rw-r--r-- | shared/systemd/src/basic/random-util.c | 2 | ||||
-rw-r--r-- | shared/systemd/src/basic/socket-util.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/shared/systemd/nm-sd-utils-shared.c b/shared/systemd/nm-sd-utils-shared.c index 4fe82ca053..2c72ba4d20 100644 --- a/shared/systemd/nm-sd-utils-shared.c +++ b/shared/systemd/nm-sd-utils-shared.c @@ -57,7 +57,7 @@ nm_sd_utils_unbase64char (char ch, gboolean accept_padding_equal) * @l: the length of @p. @p is not treated as NUL terminated string but * merely as a buffer of ascii characters. * @secure: whether the temporary memory will be cleared to avoid leaving - * secrets in memory (see also nm_explict_bzero()). + * secrets in memory (see also nm_explicit_bzero()). * @mem: (transfer full): the decoded buffer on success. * @len: the length of @mem on success. * diff --git a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h index e2378c5b4d..5a28cdfc0d 100644 --- a/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h +++ b/shared/systemd/sd-adapt-shared/nm-sd-adapt-shared.h @@ -91,7 +91,7 @@ G_STMT_START { \ /*****************************************************************************/ /* systemd cannot be compiled with "-Wdeclaration-after-statement". In particular - * in combintation with assert_cc(). */ + * in combination with assert_cc(). */ NM_PRAGMA_WARNING_DISABLE ("-Wdeclaration-after-statement") /*****************************************************************************/ diff --git a/shared/systemd/src/basic/process-util.c b/shared/systemd/src/basic/process-util.c index 6dcb26fb6b..03ca04e175 100644 --- a/shared/systemd/src/basic/process-util.c +++ b/shared/systemd/src/basic/process-util.c @@ -1344,7 +1344,7 @@ int safe_fork_full( ppid = getppid(); if (ppid == 0) - /* Parent is in a differn't PID namespace. */; + /* Parent is in a different PID namespace. */; else if (ppid != original_pid) { log_debug("Parent died early, raising SIGTERM."); (void) raise(SIGTERM); diff --git a/shared/systemd/src/basic/random-util.c b/shared/systemd/src/basic/random-util.c index 512e7af9cb..e68262359d 100644 --- a/shared/systemd/src/basic/random-util.c +++ b/shared/systemd/src/basic/random-util.c @@ -77,7 +77,7 @@ int rdrand(unsigned long *ret) { * hash functions for its hash tables, with a seed generated randomly. The hash tables * systemd employs watch the fill level closely and reseed if necessary. This allows use of * a low quality RNG initially, as long as it improves should a hash table be under attack: - * the attacker after all needs to to trigger many collisions to exploit it for the purpose + * the attacker after all needs to trigger many collisions to exploit it for the purpose * of DoS, but if doing so improves the seed the attack surface is reduced as the attack * takes place. * diff --git a/shared/systemd/src/basic/socket-util.c b/shared/systemd/src/basic/socket-util.c index 9ced3a1291..cc592da870 100644 --- a/shared/systemd/src/basic/socket-util.c +++ b/shared/systemd/src/basic/socket-util.c @@ -110,7 +110,7 @@ int socket_address_verify(const SocketAddress *a, bool strict) { if (a->size != offsetof(struct sockaddr_un, sun_path) + (e - a->sockaddr.un.sun_path) + 1) return -EINVAL; } else { - /* If there's no embedded NUL byte, then then the size needs to match the whole + /* If there's no embedded NUL byte, then the size needs to match the whole * structure or the structure with one extra NUL byte suffixed. (Yeah, Linux is awful, * and considers both equivalent: getsockname() even extends sockaddr_un beyond its * size if the path is non NUL terminated.)*/ |