moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

modified to use the renamed kerberos functions with Curl_ prefix

This commit is contained in:
Daniel Stenberg 2001-08-17 10:14:06 +00:00
parent 5ad4a52281
commit 1b00298b52
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/ftp.c
View File

@ -289,13 +289,13 @@ int Curl_GetFTPResponse(int sockfd,
/* FIXME: some errorchecking perhaps... ***/ /* FIXME: some errorchecking perhaps... ***/
switch(code) { switch(code) {
case 631: case 631:
sec_read_msg(conn, buf, prot_safe); Curl_sec_read_msg(conn, buf, prot_safe);
break; break;
case 632: case 632:
sec_read_msg(conn, buf, prot_private); Curl_sec_read_msg(conn, buf, prot_private);
break; break;
case 633: case 633:
sec_read_msg(conn, buf, prot_confidential); Curl_sec_read_msg(conn, buf, prot_confidential);
break; break;
default: default:
/* normal ftp stuff we pass through! */ /* normal ftp stuff we pass through! */
@ -392,13 +392,13 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
if(data->bits.krb4) { if(data->bits.krb4) {
/* request data protection level (default is 'clear') */ /* request data protection level (default is 'clear') */
sec_request_prot(conn, "private"); Curl_sec_request_prot(conn, "private");
/* We set private first as default, in case the line below fails to /* We set private first as default, in case the line below fails to
set a valid level */ set a valid level */
sec_request_prot(conn, data->krb4_level); Curl_sec_request_prot(conn, data->krb4_level);
if(sec_login(conn) != 0) if(Curl_sec_login(conn) != 0)
infof(data, "Logging in with password in cleartext!\n"); infof(data, "Logging in with password in cleartext!\n");
else else
infof(data, "Authentication successful\n"); infof(data, "Authentication successful\n");
@ -453,13 +453,13 @@ CURLcode Curl_ftp_connect(struct connectdata *conn)
* now set the requested protection level * now set the requested protection level
*/ */
if(conn->sec_complete) if(conn->sec_complete)
sec_set_protection_level(conn); Curl_sec_set_protection_level(conn);
/* we may need to issue a KAUTH here to have access to the files /* we may need to issue a KAUTH here to have access to the files
* do it if user supplied a password * do it if user supplied a password
*/ */
if(conn->data->passwd && *conn->data->passwd) if(conn->data->passwd && *conn->data->passwd)
krb_kauth(conn); Curl_krb_kauth(conn);
#endif #endif
} }
else { else {
@ -554,7 +554,7 @@ CURLcode Curl_ftp_done(struct connectdata *conn)
} }
#ifdef KRB4 #ifdef KRB4
sec_fflush_fd(conn, conn->secondarysocket); Curl_sec_fflush_fd(conn, conn->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->secondarysocket); sclose(conn->secondarysocket);

2
lib/http.c
View File

@ -770,7 +770,7 @@ CURLcode Curl_http(struct connectdata *conn)
* actually send. Let's make a NULL pointer equal "" here. Good/bad * actually send. Let's make a NULL pointer equal "" here. Good/bad
* ? * ?
*/ */
data->postfields = ""; data->postfields = (char *)"";
data->postfieldsize = 0; /* it might been set to something illegal, data->postfieldsize = 0; /* it might been set to something illegal,
anything > 0 would be! */ anything > 0 would be! */
} }

6
lib/security.h
View File

@ -45,7 +45,7 @@ struct Curl_sec_client_mech {
#define AUTH_CONTINUE 1 #define AUTH_CONTINUE 1
#define AUTH_ERROR 2 #define AUTH_ERROR 2
extern struct Curl_sec_client_mech krb4_client_mech, gss_client_mech; extern struct Curl_sec_client_mech Curl_krb4_client_mech;
int Curl_sec_fflush_fd(struct connectdata *conn, int fd); int Curl_sec_fflush_fd(struct connectdata *conn, int fd);
int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...); int Curl_sec_fprintf (struct connectdata *, FILE *, const char *, ...);
@ -66,7 +66,7 @@ int Curl_sec_request_prot (struct connectdata *conn, const char *level);
void Curl_sec_set_protection_level(struct connectdata *conn); void Curl_sec_set_protection_level(struct connectdata *conn);
void Curl_sec_status (void); void Curl_sec_status (void);
enum protection_level set_command_prot(struct connectdata *, enum protection_level Curl_set_command_prot(struct connectdata *,
enum protection_level); enum protection_level);
#endif #endif

4
lib/sendf.c
View File

@ -201,7 +201,7 @@ CURLcode Curl_write(struct connectdata *conn, int sockfd,
#endif #endif
#ifdef KRB4 #ifdef KRB4
if(conn->sec_complete) { if(conn->sec_complete) {
bytes_written = sec_write(conn, sockfd, mem, len); bytes_written = Curl_sec_write(conn, sockfd, mem, len);
} }
else else
#endif /* KRB4 */ #endif /* KRB4 */
@ -280,7 +280,7 @@ CURLcode Curl_read(struct connectdata *conn, int sockfd,
#endif #endif
#ifdef KRB4 #ifdef KRB4
if(conn->sec_complete) if(conn->sec_complete)
nread = sec_read(conn, sockfd, buf, buffersize); nread = Curl_sec_read(conn, sockfd, buf, buffersize);
else else
#endif #endif
nread = sread (sockfd, buf, buffersize); nread = sread (sockfd, buf, buffersize);