colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhclient: only send hostname without domain as host-name option (rh #694758)

Browse Source
This commit is contained in:
Jiří Klimeš
2011-05-09 18:09:27 +02:00
parent cecc0621ce
commit 5737573314
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/dhcp-manager/nm-dhcp-dhclient-utils.c
View File

@@ -14,7 +14,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* Copyright (C) 2010 Red Hat, Inc. * Copyright (C) 2011 Red Hat, Inc.
*/ */
#include <config.h> #include <config.h>
@@ -166,8 +166,19 @@ nm_dhcp_dhclient_create_config (const char *interface,
} }
if (hostname) { if (hostname) {
g_string_append_printf (new_contents, HOSTNAME_FORMAT "\n", hostname); char *plain_hostname, *dot;
plain_hostname = g_strdup (hostname);
dot = strchr (plain_hostname, '.');
/* get rid of the domain */
if (dot)
*dot = '\0';
g_string_append_printf (new_contents, HOSTNAME_FORMAT "\n", plain_hostname);
added = TRUE; added = TRUE;
g_free (plain_hostname);
} }
if (added) if (added)