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

policy: add short hostname to /etc/hosts too (rh #621910)

Browse Source 
If your hostname is 'foo.bar.baz' and your DNS server doesn't
actually reply to queries for 'foo.bar.baz' you can't just 'ping foo'
currently.  While that may be somewhat of a misconfigured setup,
since we're already adding the domain part of the hostname to
/etc/resolv.conf we might as well add the short hostname to /etc/hosts
too so that ping works.
This commit is contained in:
Dan Williams
2010-08-09 14:36:16 -05:00
parent 7ed22185dd
commit c72fbd6b87
2 changed files with 158 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/nm-policy-hosts.c
View File

@@ -133,6 +133,7 @@ nm_policy_get_etc_hosts (const char **lines,
gboolean hostname6_is_fallback;
gboolean host4_before = FALSE;
gboolean host6_before = FALSE;
char *short_hostname = NULL;
g_return_val_if_fail (lines != NULL, FALSE);
g_return_val_if_fail (hostname != NULL, FALSE);
@@ -206,6 +207,24 @@ nm_policy_get_etc_hosts (const char **lines,
return NULL;
}
/* Find the short hostname, like 'foo' from 'foo.bar.baz'; we want to
* make sure that the entries we add for this host also include the short
* hostname too so that if the resolver does not answer queries for the
* machine's actual hostname/domain, that stuff like 'ping foo' still works.
*/
if (!hostname4_is_fallback || !hostname6_is_fallback) {
char *dot;
short_hostname = g_strdup (hostname);
dot = strchr (short_hostname, '.');
if (dot && *(dot+1))
*dot = '\0';
else {
g_free (short_hostname);
short_hostname = NULL;
}
}
/* Construct the new hosts file; replace any 127.0.0.1/::1 entry that is
* at the beginning of the file or right after initial comments and contains
* the string 'localhost' (for IPv4) or 'localhost6' (for IPv6). If there
@@ -229,21 +248,35 @@ nm_policy_get_etc_hosts (const char **lines,
*/
/* Add the address mappings first so they take precedence */
if (!hostname4_is_fallback && ip4_addr && !found_user_host4)
g_string_append_printf (contents, "%s\t%s\t%s\n", ip4_addr, hostname, ADDED_TAG);
if (!hostname6_is_fallback && ip6_addr && !found_user_host6)
g_string_append_printf (contents, "%s\t%s\t%s\n", ip6_addr, hostname, ADDED_TAG);
if (!hostname4_is_fallback && ip4_addr && !found_user_host4) {
g_string_append_printf (contents, "%s\t%s", ip4_addr, hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
g_string_append_printf (contents, "\t%s\n", ADDED_TAG);
}
if (!hostname6_is_fallback && ip6_addr && !found_user_host6) {
g_string_append_printf (contents, "%s\t%s", ip6_addr, hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
g_string_append_printf (contents, "\t%s\n", ADDED_TAG);
}
/* IPv4 localhost line */
g_string_append (contents, "127.0.0.1");
if (!hostname4_is_fallback && !ip4_addr && !found_user_host4)
if (!hostname4_is_fallback && !ip4_addr && !found_user_host4) {
g_string_append_printf (contents, "\t%s", hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
}
g_string_append_printf (contents, "\t%s\tlocalhost\n", fallback_hostname4);
/* IPv6 localhost line */
g_string_append (contents, "::1");
if (!hostname6_is_fallback && !hostname4_is_fallback && !ip6_addr && !found_user_host6)
if (!hostname6_is_fallback && !hostname4_is_fallback && !ip6_addr && !found_user_host6) {
g_string_append_printf (contents, "\t%s", hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
}
g_string_append_printf (contents, "\t%s\tlocalhost6\n", fallback_hostname6);
added = TRUE;
@@ -277,15 +310,24 @@ nm_policy_get_etc_hosts (const char **lines,
g_string_append (contents, "# that require network functionality will fail.\n");
/* Add the address mappings first so they take precedence */
if (!hostname4_is_fallback && ip4_addr)
g_string_append_printf (contents, "%s\t%s\t%s\n", ip4_addr, hostname, ADDED_TAG);
if (!hostname6_is_fallback && ip6_addr)
g_string_append_printf (contents, "%s\t%s\t%s\n", ip6_addr, hostname, ADDED_TAG);
if (!hostname4_is_fallback && ip4_addr) {
g_string_append_printf (contents, "%s\t%s", ip4_addr, hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
g_string_append_printf (contents, "\t%s\n", ADDED_TAG);
}
if (!hostname6_is_fallback && ip6_addr) {
g_string_append_printf (contents, "%s\t%s", ip6_addr, hostname);
if (short_hostname)
g_string_append_printf (contents, "\t%s", short_hostname);
g_string_append_printf (contents, "\t%s\n", ADDED_TAG);
}
g_string_append_printf (contents, "127.0.0.1\t%s\tlocalhost\n", fallback_hostname4);
g_string_append_printf (contents, "::1\t%s\tlocalhost6\n", fallback_hostname6);
}
g_free (short_hostname);
return contents;
}

106
src/tests/test-policy-hosts.c
View File

@@ -375,6 +375,24 @@ test_hosts_named46_non127 (void)
/*******************************************/
static const char *named46_non127_long_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"192.168.1.2 comet.space comet\n"
"3001:abba::3234 comet.space comet\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static void
test_hosts_named46_non127_long (void)
{
test_generic (named46_non127_long_before, NULL, "comet.space", "192.168.1.2", "3001:abba::3234", FALSE);
}
/*******************************************/
static const char *named46_non127_other4_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
@@ -404,6 +422,35 @@ test_hosts_named46_non127_other4 (void)
/*******************************************/
static const char *named46_non127_other4_long_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"192.168.1.3 comet.space\n"
"3001:abba::3234 comet.space\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static const char *named46_non127_other4_long_after = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"192.168.1.2 comet.space comet # Added by NetworkManager\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"192.168.1.3 comet.space\n"
"3001:abba::3234 comet.space\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static void
test_hosts_named46_non127_other4_long (void)
{
test_generic (named46_non127_other4_long_before, named46_non127_other4_long_after, "comet.space", "192.168.1.2", "3001:abba::3234", FALSE);
}
/*******************************************/
static const char *named46_non127_other6_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
@@ -433,6 +480,35 @@ test_hosts_named46_non127_other6 (void)
/*******************************************/
static const char *named46_non127_other6_long_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"192.168.1.2 comet.space\n"
"3001:abba::9675 comet.space\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static const char *named46_non127_other6_long_after = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"3001:abba::3234 comet.space comet # Added by NetworkManager\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"192.168.1.2 comet.space\n"
"3001:abba::9675 comet.space\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static void
test_hosts_named46_non127_other6_long (void)
{
test_generic (named46_non127_other6_long_before, named46_non127_other6_long_after, "comet.space", "192.168.1.2", "3001:abba::3234", FALSE);
}
/*******************************************/
static const char *unnamed46_non127_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
@@ -459,6 +535,32 @@ test_hosts_unnamed46_non127 (void)
/*******************************************/
static const char *unnamed46_non127_long_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static const char *unnamed46_non127_long_after = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
"192.168.1.2 comet.space comet # Added by NetworkManager\n"
"3001:abba::3234 comet.space comet # Added by NetworkManager\n"
"127.0.0.1 localhost.localdomain localhost\n"
"::1 localhost6.localdomain6 localhost6\n"
"\n"
"127.0.0.1 lcmd.us.intellitxt.com\n";
static void
test_hosts_unnamed46_non127_long (void)
{
test_generic (unnamed46_non127_long_before, unnamed46_non127_long_after, "comet.space", "192.168.1.2", "3001:abba::3234", FALSE);
}
/*******************************************/
static const char *named46_non127_wrong_before = \
"# Do not remove the following line, or various programs\n"
"# that require network functionality will fail.\n"
@@ -592,10 +694,14 @@ int main (int argc, char **argv)
g_test_suite_add (suite, TESTCASE (test_hosts_named4_non127_more, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named6_non127_more, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_long, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_other4, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_other4_long, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_other6, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_other6_long, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named46_non127_wrong, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_unnamed46_non127, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_unnamed46_non127_long, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named_no_localhost, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_no_localhost, NULL));
g_test_suite_add (suite, TESTCASE (test_hosts_named_last, NULL));