Commit 9421b063 authored by Yang Tse's avatar Yang Tse
Browse files

Take in account that CURLAUTH_* bitmasks are now 'unsigned long' 

Data type of internal vars holding CURLAUTH_* bitmasks changed from 'long' to
'unsigned long' for proper handling and operating.
parent 09690be8

lib/http.c

+2 −2
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ static bool pickoneauth(struct auth *pick) 
{

  bool picked;

  /* only deal with authentication we want */

  long avail = pick->avail & pick->want;

  unsigned long avail = pick->avail & pick->want;

  picked = TRUE;



  /* The order of these checks is highly relevant, as this will be the order
@@ -697,7 +697,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, 
   */

  struct SessionHandle *data = conn->data;



  long *availp;

  unsigned long *availp;

  const char *start;

  struct auth *authp;

lib/url.c

+2 −2
Original line number Diff line number Diff line
@@ -1397,7 +1397,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     * Set HTTP Authentication type BITMASK.

     */

  {

    long auth = va_arg(param, long);

    unsigned long auth = va_arg(param, unsigned long);



    /* the DIGEST_IE bit is only used to set a special marker, for all the

       rest we need to handle it as normal DIGEST */
@@ -1461,7 +1461,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
     * Set HTTP Authentication type BITMASK.

     */

  {

    long auth = va_arg(param, long);

    unsigned long auth = va_arg(param, unsigned long);



    /* the DIGEST_IE bit is only used to set a special marker, for all the

       rest we need to handle it as normal DIGEST */

lib/urldata.h

+9 −9
Original line number Diff line number Diff line
@@ -986,8 +986,8 @@ struct PureInfo { 
                     thus made the document NOT get fetched */

  long header_size;  /* size of read header(s) in bytes */

  long request_size; /* the amount of bytes sent in the request(s) */

  long proxyauthavail; /* what proxy auth types were announced */

  long httpauthavail;  /* what host auth types were announced */

  unsigned long proxyauthavail; /* what proxy auth types were announced */

  unsigned long httpauthavail;  /* what host auth types were announced */

  long numconnects; /* how many new connection did libcurl created */

  char *contenttype; /* the content type of the object */

  char *wouldredirect; /* URL this would've been redirected to if asked to */
@@ -1089,11 +1089,11 @@ typedef enum { 
#define MAX_CURL_PASSWORD_LENGTH_TXT "255"



struct auth {

  long want;  /* Bitmask set to the authentication methods wanted by the app

                 (with CURLOPT_HTTPAUTH or CURLOPT_PROXYAUTH). */

  long picked;

  long avail; /* bitmask for what the server reports to support for this

                 resource */

  unsigned long want;  /* Bitmask set to the authentication methods wanted by

                          app (with CURLOPT_HTTPAUTH or CURLOPT_PROXYAUTH). */

  unsigned long picked;

  unsigned long avail; /* Bitmask for what the server reports to support for

                          this resource */

  bool done;  /* TRUE when the auth phase is done and ready to do the *actual*

                 request */

  bool multi; /* TRUE if this is not yet authenticated but within the auth
@@ -1361,8 +1361,8 @@ struct UserDefined { 
  void *writeheader; /* write the header to this if non-NULL */

  void *rtp_out;     /* write RTP to this if non-NULL */

  long use_port;     /* which port to use (when not using default) */

  long httpauth;     /* what kind of HTTP authentication to use (bitmask) */

  long proxyauth;    /* what kind of proxy authentication to use (bitmask) */

  unsigned long httpauth;  /* kind of HTTP authentication to use (bitmask) */

  unsigned long proxyauth; /* kind of proxy authentication to use (bitmask) */

  long followlocation; /* as in HTTP Location: */

  long maxredirs;    /* maximum no. of http(s) redirects to follow, set to -1

                        for infinity */

src/tool_cfgable.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct Configurable { 
  bool cookiesession;       /* new session? */

  bool encoding;            /* Accept-Encoding please */

  bool tr_encoding;         /* Transfer-Encoding please */

  long authtype;            /* auth bitmask */

  unsigned long authtype;   /* auth bitmask */

  bool use_resume;

  bool resume_from_current;

  bool disable_epsv;

src/tool_operate.c

+1 −1
Original line number Diff line number Diff line
@@ -680,7 +680,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[]) 
          int authbits = 0;

          int bitcheck = 0;

          while(bitcheck < 32) {

            if(config->authtype & (1 << bitcheck++)) {

            if(config->authtype & (1UL << bitcheck++)) {

              authbits++;

              if(authbits > 1) {

                /* more than one, we're done! */