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

hostname: return NULL from failed hostname lookup, not zero-length string

Browse source
This commit is contained in:
Dan Williams 2010-05-03 20:34:22 -07:00
parent 719738d133
commit e1eee77497
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/nm-policy-hostname.c
View file

@ -51,8 +51,12 @@ static gboolean
hostname_thread_run_cb (gpointer user_data)
{
HostnameThread *ht = (HostnameThread *) user_data;
const char *hostname = NULL;
(*ht->callback) (ht, ht->ret, ht->hostname, ht->user_data);
if (strlen (ht->hostname))
hostname = ht->hostname;
(*ht->callback) (ht, ht->ret, hostname, ht->user_data);
return FALSE;
}
@ -148,9 +152,14 @@ nm_policy_set_system_hostname (const char *new_hostname, const char *msg)
{
char old_hostname[HOST_NAME_MAX + 1];
int ret = 0;
const char *name = new_hostname ? new_hostname : FALLBACK_HOSTNAME;
const char *name;
gboolean set_hostname = TRUE, changed = FALSE;
if (new_hostname)
g_warn_if_fail (strlen (new_hostname));
name = (new_hostname && strlen (new_hostname)) ? new_hostname : FALLBACK_HOSTNAME;
old_hostname[HOST_NAME_MAX] = '\0';
errno = 0;
ret = gethostname (old_hostname, HOST_NAME_MAX);