adjusted to the new Curl_resolv() proto
This commit is contained in:
Родитель
00e4f81446
Коммит
f564905ac4
|
@ -1205,19 +1205,19 @@ CURLcode ftp_use_port(struct connectdata *conn)
|
||||||
|
|
||||||
if(data->set.ftpport) {
|
if(data->set.ftpport) {
|
||||||
if(Curl_if2ip(data->set.ftpport, myhost, sizeof(myhost))) {
|
if(Curl_if2ip(data->set.ftpport, myhost, sizeof(myhost))) {
|
||||||
h = Curl_resolv(data, myhost, 0, &hostdataptr);
|
h = Curl_resolv(data, myhost, 0);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
int len = strlen(data->set.ftpport);
|
int len = strlen(data->set.ftpport);
|
||||||
if(len>1)
|
if(len>1)
|
||||||
h = Curl_resolv(data, data->set.ftpport, 0, &hostdataptr);
|
h = Curl_resolv(data, data->set.ftpport, 0);
|
||||||
if(h)
|
if(h)
|
||||||
strcpy(myhost, data->set.ftpport); /* buffer overflow risk */
|
strcpy(myhost, data->set.ftpport); /* buffer overflow risk */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(! *myhost) {
|
if(! *myhost) {
|
||||||
char *tmp_host = getmyhost(myhost, sizeof(myhost));
|
char *tmp_host = getmyhost(myhost, sizeof(myhost));
|
||||||
h=Curl_resolv(data, tmp_host, 0, &hostdataptr);
|
h=Curl_resolv(data, tmp_host, 0);
|
||||||
}
|
}
|
||||||
infof(data, "We connect from %s\n", myhost);
|
infof(data, "We connect from %s\n", myhost);
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче