|
 |
bb908ed |
From ff9c310454e36acf996491ad154487c85b19f87a Mon Sep 17 00:00:00 2001
|
|
|
bb908ed |
From: Beniamino Galvani <bgalvani@redhat.com>
|
|
|
bb908ed |
Date: Mon, 22 Feb 2016 10:01:30 +0100
|
|
|
bb908ed |
Subject: [PATCH 2/3] policy: simplify set_system_hostname()
|
|
|
bb908ed |
|
|
|
bb908ed |
Move some conditionals to the beginning of the function.
|
|
|
bb908ed |
---
|
|
|
bb908ed |
src/nm-policy.c | 14 ++++++++------
|
|
|
bb908ed |
1 file changed, 8 insertions(+), 6 deletions(-)
|
|
|
bb908ed |
|
|
|
bb908ed |
diff --git a/src/nm-policy.c b/src/nm-policy.c
|
|
|
bb908ed |
index cfb140f..fca4005 100644
|
|
|
bb908ed |
--- a/src/nm-policy.c
|
|
|
bb908ed |
+++ b/src/nm-policy.c
|
|
|
bb908ed |
@@ -148,8 +148,13 @@ set_system_hostname (NMPolicy *self, const char *new_hostname, const char *msg)
|
|
|
bb908ed |
const char *name;
|
|
|
bb908ed |
int ret;
|
|
|
bb908ed |
|
|
|
bb908ed |
- if (new_hostname)
|
|
|
bb908ed |
- g_warn_if_fail (strlen (new_hostname));
|
|
|
bb908ed |
+ if (!new_hostname)
|
|
|
bb908ed |
+ name = FALLBACK_HOSTNAME4;
|
|
|
bb908ed |
+ else if (!new_hostname[0]) {
|
|
|
bb908ed |
+ g_warn_if_reached ();
|
|
|
bb908ed |
+ name = FALLBACK_HOSTNAME4;
|
|
|
bb908ed |
+ } else
|
|
|
bb908ed |
+ name = new_hostname;
|
|
|
bb908ed |
|
|
|
bb908ed |
old_hostname[HOST_NAME_MAX] = '\0';
|
|
|
bb908ed |
errno = 0;
|
|
|
bb908ed |
@@ -159,13 +164,10 @@ set_system_hostname (NMPolicy *self, const char *new_hostname, const char *msg)
|
|
|
bb908ed |
errno, strerror (errno));
|
|
|
bb908ed |
} else {
|
|
|
bb908ed |
/* Don't set the hostname if it isn't actually changing */
|
|
|
bb908ed |
- if ( (new_hostname && !strcmp (old_hostname, new_hostname))
|
|
|
bb908ed |
- || (!new_hostname && !strcmp (old_hostname, FALLBACK_HOSTNAME4)))
|
|
|
bb908ed |
+ if (nm_streq (name, old_hostname))
|
|
|
bb908ed |
return;
|
|
|
bb908ed |
}
|
|
|
bb908ed |
|
|
|
bb908ed |
- name = (new_hostname && strlen (new_hostname)) ? new_hostname : FALLBACK_HOSTNAME4;
|
|
|
bb908ed |
-
|
|
|
bb908ed |
nm_log_info (LOGD_DNS, "Setting system hostname to '%s' (%s)", name, msg);
|
|
|
bb908ed |
nm_settings_set_transient_hostname (priv->settings,
|
|
|
bb908ed |
name,
|
|
|
bb908ed |
--
|
|
|
bb908ed |
2.5.0
|
|
|
bb908ed |
|