git-svn-id: svn+ssh://svn.dolda2000.com/srv/svn/repos/src/doldaconnect@588
959494ce-11ee-0310-bf91-
de5d638817bd
*lenbuf = sizeof(*ipv4);
return(0);
}
*lenbuf = sizeof(*ipv4);
return(0);
}
- if((pif = icwcstombs(confgetstr("net", "publicif"), NULL)) == NULL)
+ if((pif = icswcstombs(confgetstr("net", "publicif"), NULL, NULL)) == NULL)
{
flog(LOG_ERR, "could not convert net.publicif into local charset: %s", strerror(errno));
return(-1);
{
flog(LOG_ERR, "could not convert net.publicif into local charset: %s", strerror(errno));
return(-1);
memcpy(ipv4, &ifr->ifr_addr, sizeof(ifr->ifr_addr));
} else {
free(ipv4);
memcpy(ipv4, &ifr->ifr_addr, sizeof(ifr->ifr_addr));
} else {
free(ipv4);
flog(LOG_WARNING, "could not locate an unambiguous interface for determining your public IP address - set net.publicif");
errno = ENFILE; /* XXX: There's no appropriate one for this... */
return(-1);
}
}
}
flog(LOG_WARNING, "could not locate an unambiguous interface for determining your public IP address - set net.publicif");
errno = ENFILE; /* XXX: There's no appropriate one for this... */
return(-1);
}
}
}
close(sock);
if(ipv4 != NULL)
{
close(sock);
if(ipv4 != NULL)
{