diff options
| -rw-r--r-- | lib/ftp.c | 2 | ||||
| -rw-r--r-- | lib/krb4.c | 20 | ||||
| -rw-r--r-- | lib/security.c | 20 |
3 files changed, 21 insertions, 21 deletions
@@ -462,7 +462,7 @@ CURLcode Curl_ftp_connect(struct connectdata *conn) /* we may need to issue a KAUTH here to have access to the files * do it if user supplied a password */ - if(conn->data->set.passwd && *conn->data->set.passwd) + if(data->state.passwd && *data->state.passwd) Curl_krb_kauth(conn); #endif } diff --git a/lib/krb4.c b/lib/krb4.c index e95a060f3..ba7643e96 100644 --- a/lib/krb4.c +++ b/lib/krb4.c @@ -248,17 +248,17 @@ krb4_auth(void *app_data, struct connectdata *conn) Curl_ftpsendf(conn->firstsocket, conn, "ADAT %s", p); nread = Curl_GetFTPResponse(conn->firstsocket, - conn->data.set->buffer, conn, NULL); + conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/-1; free(p); - if(/*ret != COMPLETE*/conn->data.set->buffer[0] != '2'){ + if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){ printf("Server didn't accept auth data.\n"); return AUTH_ERROR; } - p = strstr(conn->data.set->buffer, "ADAT="); + p = strstr(conn->data->state.buffer, "ADAT="); if(!p){ printf("Remote host didn't send adat reply.\n"); return AUTH_ERROR; @@ -314,20 +314,20 @@ void Curl_krb_kauth(struct connectdata *conn) save = Curl_set_command_prot(conn, prot_private); Curl_ftpsendf(conn->firstsocket, conn, - "SITE KAUTH %s", conn->data.set->user); + "SITE KAUTH %s", conn->data->state.user); - nread = Curl_GetFTPResponse(conn->firstsocket, conn->data.set->buffer, + nread = Curl_GetFTPResponse(conn->firstsocket, conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/; - if(/*ret != CONTINUE*/conn->data.set->buffer[0] != '3'){ + if(/*ret != CONTINUE*/conn->data->state.buffer[0] != '3'){ Curl_set_command_prot(conn, save); /*code = -1;***/ return; } - p = strstr(conn->data.set->buffer, "T="); + p = strstr(conn->data->state.buffer, "T="); if(!p) { printf("Bad reply from server.\n"); Curl_set_command_prot(conn, save); @@ -344,7 +344,7 @@ void Curl_krb_kauth(struct connectdata *conn) tkt.length = tmp; tktcopy.length = tkt.length; - p = strstr(conn->data.set->buffer, "P="); + p = strstr(conn->data->state.buffer, "P="); if(!p) { printf("Bad reply from server.\n"); Curl_set_command_prot(conn, save); @@ -354,7 +354,7 @@ void Curl_krb_kauth(struct connectdata *conn) for(; *p && *p != ' ' && *p != '\r' && *p != '\n'; p++); *p = 0; - des_string_to_key (conn->data.set->passwd, &key); + des_string_to_key (conn->data->state.passwd, &key); des_key_sched(&key, schedule); des_pcbc_encrypt((des_cblock*)tkt.dat, (des_cblock*)tktcopy.dat, @@ -383,7 +383,7 @@ void Curl_krb_kauth(struct connectdata *conn) Curl_ftpsendf(conn->firstsocket, conn, "SITE KAUTH %s %s", name, p); - nread = Curl_GetFTPResponse(conn->firstsocket, conn->data.set->buffer, + nread = Curl_GetFTPResponse(conn->firstsocket, conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/; diff --git a/lib/security.c b/lib/security.c index 88b89b0fa..616f9e04a 100644 --- a/lib/security.c +++ b/lib/security.c @@ -417,15 +417,15 @@ sec_prot_internal(struct connectdata *conn, int level) "PBSZ %u", s); /* wait for feedback */ nread = Curl_GetFTPResponse(conn->firstsocket, - conn->data.set->buffer, conn, NULL); + conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/-1; - if(/*ret != COMPLETE*/conn->data.set->buffer[0] != '2'){ + if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){ failf(conn->data, "Failed to set protection buffer size.\n"); return -1; } conn->buffer_size = s; - p = strstr(/*reply_string*/conn->data.set->buffer, "PBSZ="); + p = strstr(/*reply_string*/conn->data->state.buffer, "PBSZ="); if(p) sscanf(p, "PBSZ=%u", &s); if(s < conn->buffer_size) @@ -436,10 +436,10 @@ sec_prot_internal(struct connectdata *conn, int level) "PROT %c", level["CSEP"]); /* wait for feedback */ nread = Curl_GetFTPResponse(conn->firstsocket, - conn->data.set->buffer, conn, NULL); + conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/-1; - if(/*ret != COMPLETE*/conn->data.set->buffer[0] != '2'){ + if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){ failf(conn->data, "Failed to set protection level.\n"); return -1; } @@ -494,18 +494,18 @@ Curl_sec_login(struct connectdata *conn) "AUTH %s", (*m)->name); /* wait for feedback */ nread = Curl_GetFTPResponse(conn->firstsocket, - conn->data.set->buffer, conn, NULL); + conn->data->state.buffer, conn, NULL); if(nread < 0) return /*CURLE_OPERATION_TIMEOUTED*/-1; - if(/*ret != CONTINUE*/conn->data.set->buffer[0] != '3'){ - if(/*code == 504*/strncmp(conn->data.set->buffer,"504",3) == 0) { + if(/*ret != CONTINUE*/conn->data->state.buffer[0] != '3'){ + if(/*code == 504*/strncmp(conn->data->state.buffer,"504",3) == 0) { infof(data, "%s is not supported by the server.\n", (*m)->name); } - else if(/*code == 534*/strncmp(conn->data.set->buffer,"534",3) == 0) { + else if(/*code == 534*/strncmp(conn->data->state.buffer,"534",3) == 0) { infof(data, "%s rejected as security mechanism.\n", (*m)->name); } - else if(/*ret == ERROR*/conn->data.set->buffer[0] == '5') { + else if(/*ret == ERROR*/conn->data->state.buffer[0] == '5') { infof(data, "The server doesn't support the FTP " "security extensions.\n"); return -1; |