fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-07 20:40:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: use define for secret_key filename

Browse source 
(cherry picked from commit 2c7c333297)
This commit is contained in:
Thomas Haller 2018-12-12 07:34:34 +01:00
parent cfc0c6d514
commit 0b451b4c87
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nm-core-utils.c
View file

@ -2716,6 +2716,8 @@ nm_utils_machine_id_is_fake (void)
/*****************************************************************************/
#define SECRET_KEY_FILE NMSTATEDIR"/secret_key"
static gboolean
_secret_key_read (guint8 **out_secret_key,
gsize *out_key_len)
@ -2726,18 +2728,18 @@ _secret_key_read (guint8 **out_secret_key,
gs_free_error GError *error = NULL;
/* Let's try to load a saved secret key first. */
if (g_file_get_contents (NMSTATEDIR "/secret_key", (char **) &secret_key, &key_len, &error)) {
if (g_file_get_contents (SECRET_KEY_FILE, (char **) &secret_key, &key_len, &error)) {
if (key_len >= 16)
goto out;
/* the secret key is borked. Log a warning, but proceed below to generate
* a new one. */
nm_log_warn (LOGD_CORE, "secret-key: too short secret key in \"%s\" (generate new key)", NMSTATEDIR "/secret_key");
nm_log_warn (LOGD_CORE, "secret-key: too short secret key in \"%s\" (generate new key)", SECRET_KEY_FILE);
nm_clear_g_free (&secret_key);
} else {
if (!nm_utils_error_is_notfound (error)) {
nm_log_warn (LOGD_CORE, "secret-key: failure reading secret key in \"%s\": %s (generate new key)",
NMSTATEDIR "/secret_key", error->message);
SECRET_KEY_FILE, error->message);
}
g_clear_error (&error);
}
@ -2763,9 +2765,9 @@ _secret_key_read (guint8 **out_secret_key,
goto out;
}
if (!nm_utils_file_set_contents (NMSTATEDIR "/secret_key", (char *) secret_key, key_len, 0077, &error)) {
if (!nm_utils_file_set_contents (SECRET_KEY_FILE, (char *) secret_key, key_len, 0077, &error)) {
nm_log_warn (LOGD_CORE, "secret-key: failure to persist secret key in \"%s\" (%s) (use non-persistent key)",
NMSTATEDIR "/secret_key", error->message);
SECRET_KEY_FILE, error->message);
success = FALSE;
goto out;
}
@ -2827,7 +2829,7 @@ nm_utils_secret_key_get_timestamp (void)
if (!nm_utils_secret_key_get (&key, &key_len))
return 0;
if (stat (NMSTATEDIR "/secret_key", &stat_buf) != 0)
if (stat (SECRET_KEY_FILE, &stat_buf) != 0)
return 0;
return stat_buf.st_mtim.tv_sec;