generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

curl_sasl.c: More code policing

Browse Source 
Better use of 80 character line limit, comment corrections and line
spacing preferences.
This commit is contained in:
Steve Holme 2015-02-02 16:44:00 +00:00
parent ae9963776a
commit 0a7182f6ad
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/curl_sasl.c
View File

@ -1313,8 +1313,8 @@ void Curl_sasl_init(struct SASL *sasl, const struct SASLproto *params)
* *
* This is the ONLY way to change SASL state! * This is the ONLY way to change SASL state!
*/ */
static void state(struct SASL *sasl, static void state(struct SASL *sasl, struct connectdata *conn,
struct connectdata *conn, saslstate newstate) saslstate newstate)
{ {
#if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS) #if defined(DEBUGBUILD) && !defined(CURL_DISABLE_VERBOSE_STRINGS)
/* for debug purposes */ /* for debug purposes */
@ -1353,14 +1353,15 @@ static void state(struct SASL *sasl,
* *
* Check if we have enough auth data and capabilities to authenticate. * Check if we have enough auth data and capabilities to authenticate.
*/ */
bool Curl_sasl_can_authenticate(struct SASL *sasl, struct connectdata *conn) bool Curl_sasl_can_authenticate(struct SASL *sasl, struct connectdata *conn)
{ {
/* Have credentials been provided? */
if(conn->bits.user_passwd) if(conn->bits.user_passwd)
return TRUE; /* Credentials provided */ return TRUE;
/* EXTERNAL can authenticate without a user name and/or password */
if(sasl->authmechs & sasl->prefmech & SASL_MECH_EXTERNAL) if(sasl->authmechs & sasl->prefmech & SASL_MECH_EXTERNAL)
return TRUE; /* Can authenticate without password */ return TRUE;
return FALSE; return FALSE;
} }
@ -1478,6 +1479,7 @@ CURLcode Curl_sasl_start(struct SASL *sasl, struct connectdata *conn,
Curl_safefree(resp); Curl_safefree(resp);
resp = NULL; resp = NULL;
} }
if(mech) { if(mech) {
result = sasl->params->sendauth(conn, mech, resp); result = sasl->params->sendauth(conn, mech, resp);
if(!result) { if(!result) {
@ -1573,15 +1575,14 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct connectdata *conn,
case SASL_NTLM: case SASL_NTLM:
/* Create the type-1 message */ /* Create the type-1 message */
result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd, result = Curl_sasl_create_ntlm_type1_message(conn->user, conn->passwd,
&conn->ntlm, &conn->ntlm, &resp, &len);
&resp, &len);
newstate = SASL_NTLM_TYPE2MSG; newstate = SASL_NTLM_TYPE2MSG;
break; break;
case SASL_NTLM_TYPE2MSG: case SASL_NTLM_TYPE2MSG:
/* Decode the type-2 message */ /* Decode the type-2 message */
sasl->params->getmessage(data->state.buffer, &serverdata); sasl->params->getmessage(data->state.buffer, &serverdata);
result = Curl_sasl_decode_ntlm_type2_message(data, result = Curl_sasl_decode_ntlm_type2_message(data, serverdata,
serverdata, &conn->ntlm); &conn->ntlm);
if(!result) if(!result)
result = Curl_sasl_create_ntlm_type3_message(data, conn->user, result = Curl_sasl_create_ntlm_type3_message(data, conn->user,
conn->passwd, &conn->ntlm, conn->passwd, &conn->ntlm,