Merge branch '2.1-ipv6' into develop

This commit is contained in:
Markus Mäkelä
2017-03-13 13:18:08 +02:00
17 changed files with 412 additions and 423 deletions

View File

@ -307,11 +307,11 @@ serviceStartPort(SERVICE *service, SERV_LISTENER *port)
if (port->address)
{
sprintf(config_bind, "%s:%d", port->address, port->port);
sprintf(config_bind, "%s|%d", port->address, port->port);
}
else
{
sprintf(config_bind, "0.0.0.0:%d", port->port);
sprintf(config_bind, "0.0.0.0|%d", port->port);
}
/** Load the authentication users before before starting the listener */