adjusted code to the new socket fields in the sessionhandle struct
This commit is contained in:
@@ -728,7 +728,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
Curl_sec_fflush_fd(conn, conn->secondarysocket);
|
Curl_sec_fflush_fd(conn, conn->sock[SECONDARYSOCKET]);
|
||||||
#endif
|
#endif
|
||||||
/* shut down the socket to inform the server we're done */
|
/* shut down the socket to inform the server we're done */
|
||||||
sclose(conn->sock[SECONDARYSOCKET]);
|
sclose(conn->sock[SECONDARYSOCKET]);
|
||||||
@@ -1334,7 +1334,7 @@ CURLcode ftp_use_port(struct connectdata *conn)
|
|||||||
/* we set the secondary socket variable to this for now, it
|
/* we set the secondary socket variable to this for now, it
|
||||||
is only so that the cleanup function will close it in case
|
is only so that the cleanup function will close it in case
|
||||||
we fail before the true secondary stuff is made */
|
we fail before the true secondary stuff is made */
|
||||||
conn->secondarysocket = portsock;
|
conn->sock[SECONDARYSOCKET] = portsock;
|
||||||
|
|
||||||
if(!sa_filled_in) {
|
if(!sa_filled_in) {
|
||||||
memset((char *)&sa, 0, sizeof(sa));
|
memset((char *)&sa, 0, sizeof(sa));
|
||||||
|
@@ -209,7 +209,7 @@ krb4_auth(void *app_data, struct connectdata *conn)
|
|||||||
struct SessionHandle *data = conn->data;
|
struct SessionHandle *data = conn->data;
|
||||||
CURLcode result;
|
CURLcode result;
|
||||||
|
|
||||||
if(getsockname(conn->firstsocket,
|
if(getsockname(conn->sock[FIRSTSOCKET],
|
||||||
(struct sockaddr *)LOCAL_ADDR, &l) < 0)
|
(struct sockaddr *)LOCAL_ADDR, &l) < 0)
|
||||||
perror("getsockname()");
|
perror("getsockname()");
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user