Commit e9de8e78 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

SASL: fix compiler warnings 

comparison between signed and unsigned integer expressions

suggest parentheses around '&&' within '||' (twice)
parent 2eabb7d5

lib/curl_sasl.h

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


/* Authentication mechanism values */

#define SASL_AUTH_NONE          0

#define SASL_AUTH_ANY           ~0

#define SASL_AUTH_ANY           ~0U



/* This is used to generate a base64 encoded PLAIN authentication message */

CURLcode Curl_sasl_create_plain_message(struct SessionHandle *data,

lib/imap.c

+3 −3
Original line number Diff line number Diff line
@@ -579,9 +579,9 @@ static CURLcode imap_perform_authenticate(struct connectdata *conn) 
  }

  else

#endif

  if((imapc->authmechs & SASL_MECH_XOAUTH2) &&

  if(((imapc->authmechs & SASL_MECH_XOAUTH2) &&

      (imapc->prefmech & SASL_MECH_XOAUTH2) &&

     (imapc->prefmech != SASL_AUTH_ANY) || conn->xoauth2_bearer) {

      (imapc->prefmech != SASL_AUTH_ANY)) || conn->xoauth2_bearer) {

    mech = "XOAUTH2";

    state1 = IMAP_AUTHENTICATE_XOAUTH2;

    state2 = IMAP_AUTHENTICATE_FINAL;

lib/smtp.c

+3 −3
Original line number Diff line number Diff line
@@ -500,9 +500,9 @@ static CURLcode smtp_perform_authenticate(struct connectdata *conn) 
    }

  else

#endif

  if((smtpc->authmechs & SASL_MECH_XOAUTH2) &&

  if(((smtpc->authmechs & SASL_MECH_XOAUTH2) &&

      (smtpc->prefmech & SASL_MECH_XOAUTH2) &&

     (smtpc->prefmech != SASL_AUTH_ANY) || conn->xoauth2_bearer) {

      (smtpc->prefmech != SASL_AUTH_ANY)) || conn->xoauth2_bearer) {

    mech = "XOAUTH2";

    state1 = SMTP_AUTH_XOAUTH2;

    state2 = SMTP_AUTH_FINAL;