From 065e810424372b5969bbf910cf39fb6fd5d0ce9e Mon Sep 17 00:00:00 2001 From: "Patrick J. Volkerding" Date: Mon, 13 Nov 2017 00:17:38 -0600 Subject: [PATCH] hostname-manager: use fqdn for persistent hostname on Slackware This will be the default for Slackware 15.0 and on. This should be safe for both master and 1.12.x stable branch, as no existing Slackware releases are expected to run NM-1.12.x or later. Signed-off-by: Robby Workman https://mail.gnome.org/archives/networkmanager-list/2019-May/msg00011.html (cherry picked from commit e1df17e0acd14418608c2057ea4f49c31208053e) --- src/nm-hostname-manager.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/nm-hostname-manager.c b/src/nm-hostname-manager.c index 3fcd848261..db56111600 100644 --- a/src/nm-hostname-manager.c +++ b/src/nm-hostname-manager.c @@ -131,8 +131,7 @@ read_hostname_slackware (const char *path) { gs_free char *contents = NULL; gs_strfreev char **all_lines = NULL; - char *tmp; - guint i, j = 0; + guint i = 0; if (!g_file_get_contents (path, &contents, NULL, NULL)) return NULL; @@ -142,17 +141,7 @@ read_hostname_slackware (const char *path) g_strstrip (all_lines[i]); if (all_lines[i][0] == '#' || all_lines[i][0] == '\0') continue; - tmp = &all_lines[i][0]; - /* We only want up to the first '.' -- the rest of the */ - /* fqdn is defined in /etc/hosts */ - while (tmp[j] != '\0') { - if (tmp[j] == '.') { - tmp[j] = '\0'; - break; - } - j++; - } - return g_shell_unquote (tmp, NULL); + return g_shell_unquote (&all_lines[i][0], NULL); } return NULL; }