diff --git a/src/memcached.c b/src/memcached.c
index 77cadebb9a2962cc9a953372641325fd7fbe260c..bd83b46eeb26782ea8983cb485e2f233ddba42a9 100644 (file)
--- a/src/memcached.c
+++ b/src/memcached.c
{
char const *host = st->host;
- /* Set vl->host to hostname_g, if:
+ /* Keep default hostname, if:
* - Legacy mode is used.
* - "Socket" option is given (doc: "Host option is ignored").
* - "Host" option is not provided.
* - "Host" option is set to "localhost" or "127.0.0.1". */
- if ((strcmp (st->name, "__legacy__") == 0)
- || (st->socket != NULL)
- || (st->host == NULL)
- || (strcmp ("127.0.0.1", st->host) == 0)
- || (strcmp ("localhost", st->host) == 0))
- host = hostname_g;
+ if ((strcmp (st->name, "__legacy__") != 0)
+ && (st->socket == NULL)
+ && (st->host != NULL)
+ && (strcmp ("127.0.0.1", st->host) != 0)
+ && (strcmp ("localhost", st->host) != 0))
+ sstrncpy (vl->host, host, sizeof (vl->host));
sstrncpy (vl->plugin, "memcached", sizeof (vl->plugin));
- sstrncpy (vl->host, host, sizeof (vl->host));
if (strcmp (st->name, "__legacy__") != 0)
sstrncpy (vl->plugin_instance, st->name, sizeof (vl->plugin_instance));
}