moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-03-07 20:59:41 -05:00
Code Issues Releases Wiki Activity

improved readability slightly

Browse Source
This commit is contained in:
Daniel Stenberg 2001-09-28 09:25:59 +00:00
parent 09da2c1767
commit 88e21894c7
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/security.c
View File

@ -413,18 +413,18 @@ sec_prot_internal(struct connectdata *conn, int level)
} }
if(level){ if(level){
Curl_ftpsendf(conn, Curl_ftpsendf(conn, "PBSZ %u", s);
"PBSZ %u", s);
/* wait for feedback */
nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL); nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL);
if(nread < 0) if(nread < 0)
return /*CURLE_OPERATION_TIMEOUTED*/-1; return -1;
if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){
if(conn->data->state.buffer[0] != '2'){
failf(conn->data, "Failed to set protection buffer size.\n"); failf(conn->data, "Failed to set protection buffer size.\n");
return -1; return -1;
} }
conn->buffer_size = s; conn->buffer_size = s;
p = strstr(/*reply_string*/conn->data->state.buffer, "PBSZ=");
p = strstr(conn->data->state.buffer, "PBSZ=");
if(p) if(p)
sscanf(p, "PBSZ=%u", &s); sscanf(p, "PBSZ=%u", &s);
if(s < conn->buffer_size) if(s < conn->buffer_size)
@ -432,12 +432,11 @@ sec_prot_internal(struct connectdata *conn, int level)
} }
Curl_ftpsendf(conn, "PROT %c", level["CSEP"]); Curl_ftpsendf(conn, "PROT %c", level["CSEP"]);
/* wait for feedback */
nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL); nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL);
if(nread < 0) if(nread < 0)
return -1;
return /*CURLE_OPERATION_TIMEOUTED*/-1; if(conn->data->state.buffer[0] != '2'){
if(/*ret != COMPLETE*/conn->data->state.buffer[0] != '2'){
failf(conn->data, "Failed to set protection level.\n"); failf(conn->data, "Failed to set protection level.\n");
return -1; return -1;
} }
@ -471,6 +470,7 @@ Curl_sec_login(struct connectdata *conn)
struct Curl_sec_client_mech **m; struct Curl_sec_client_mech **m;
ssize_t nread; ssize_t nread;
struct SessionHandle *data=conn->data; struct SessionHandle *data=conn->data;
int ftpcode;
for(m = mechs; *m && (*m)->name; m++) { for(m = mechs; *m && (*m)->name; m++) {
void *tmp; void *tmp;
@ -487,30 +487,34 @@ Curl_sec_login(struct connectdata *conn)
continue; continue;
} }
infof(data, "Trying %s...\n", (*m)->name); infof(data, "Trying %s...\n", (*m)->name);
/*ret = command("AUTH %s", (*m)->name);***/
Curl_ftpsendf(conn, Curl_ftpsendf(conn, "AUTH %s", (*m)->name);
"AUTH %s", (*m)->name);
/* wait for feedback */ nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, &ftpcode);
nread = Curl_GetFTPResponse(conn->data->state.buffer, conn, NULL);
if(nread < 0) if(nread < 0)
return /*CURLE_OPERATION_TIMEOUTED*/-1; return -1;
if(/*ret != CONTINUE*/conn->data->state.buffer[0] != '3'){
if(/*code == 504*/strncmp(conn->data->state.buffer,"504",3) == 0) { if(conn->data->state.buffer[0] != '3'){
switch(ftpcode) {
case 504:
infof(data, infof(data,
"%s is not supported by the server.\n", (*m)->name); "%s is not supported by the server.\n", (*m)->name);
} break;
else if(/*code == 534*/strncmp(conn->data->state.buffer,"534",3) == 0) { case 534:
infof(data, "%s rejected as security mechanism.\n", (*m)->name); infof(data, "%s rejected as security mechanism.\n", (*m)->name);
} break;
else if(/*ret == ERROR*/conn->data->state.buffer[0] == '5') { default:
infof(data, "The server doesn't support the FTP " if(conn->data->state.buffer[0] == '5') {
"security extensions.\n"); infof(data, "The server doesn't support the FTP "
return -1; "security extensions.\n");
return -1;
}
break;
} }
continue; continue;
} }
ret = (*(*m)->auth)(conn->app_data, /*host***/conn); ret = (*(*m)->auth)(conn->app_data, conn);
if(ret == AUTH_CONTINUE) if(ret == AUTH_CONTINUE)
continue; continue;