Merge branch 'master' of github.com:charybdis-ircd/charybdis

This commit is contained in:
Elizabeth Myers 2016-03-14 22:14:28 -05:00
commit 9ca15a2679
1 changed files with 3 additions and 3 deletions

View File

@ -239,7 +239,7 @@ conf_set_serverinfo_vhost(void *data)
{
if(rb_inet_pton(AF_INET, (char *) data, &ServerInfo.ip.sin_addr) <= 0)
{
conf_report_error("Invalid netmask for server IPv4 vhost (%s)", (char *) data);
conf_report_error("Invalid IPv4 address for server vhost (%s)", (char *) data);
return;
}
ServerInfo.ip.sin_family = AF_INET;
@ -252,7 +252,7 @@ conf_set_serverinfo_vhost6(void *data)
#ifdef RB_IPV6
if(rb_inet_pton(AF_INET6, (char *) data, &ServerInfo.ip6.sin6_addr) <= 0)
{
conf_report_error("Invalid netmask for server IPv6 vhost (%s)", (char *) data);
conf_report_error("Invalid IPv6 address for server vhost (%s)", (char *) data);
return;
}
@ -1325,7 +1325,7 @@ conf_set_connect_vhost(void *data)
{
if(rb_inet_pton_sock(data, (struct sockaddr *)&yy_server->my_ipnum) <= 0)
{
conf_report_error("Invalid netmask for server vhost (%s)",
conf_report_error("Invalid IP address for server connect vhost (%s)",
(char *) data);
return;
}