fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-09 03:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

policy: simplify set_system_hostname()

Browse source 
Move some conditionals to the beginning of the function.
This commit is contained in:
Beniamino Galvani 2016-02-22 10:01:30 +01:00
parent 4090716d96
commit f87d25f7a1
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nm-policy.c
View file

@ -157,8 +157,13 @@ set_system_hostname (NMPolicy *self, const char *new_hostname, const char *msg)
const char *name; const char *name;
int ret; int ret;
if (new_hostname) if (!new_hostname)
g_warn_if_fail (strlen (new_hostname)); name = FALLBACK_HOSTNAME4;
else if (!new_hostname[0]) {
g_warn_if_reached ();
name = FALLBACK_HOSTNAME4;
} else
name = new_hostname;
old_hostname[HOST_NAME_MAX] = '\0'; old_hostname[HOST_NAME_MAX] = '\0';
errno = 0; errno = 0;
@ -168,12 +173,10 @@ set_system_hostname (NMPolicy *self, const char *new_hostname, const char *msg)
errno, strerror (errno)); errno, strerror (errno));
} else { } else {
/* Don't set the hostname if it isn't actually changing */ /* Don't set the hostname if it isn't actually changing */
if ( (new_hostname && !strcmp (old_hostname, new_hostname)) if (nm_streq (name, old_hostname))
|| (!new_hostname && !strcmp (old_hostname, FALLBACK_HOSTNAME4)))
return; return;
} }
name = (new_hostname && strlen (new_hostname)) ? new_hostname : FALLBACK_HOSTNAME4;
_LOGI (LOGD_DNS, "setting system hostname to '%s' (%s)", name, msg); _LOGI (LOGD_DNS, "setting system hostname to '%s' (%s)", name, msg);
nm_settings_set_transient_hostname (priv->settings, nm_settings_set_transient_hostname (priv->settings,
name, name,