Commit 52b631fa authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Access the user and passwd fields from the connectdata struct now instead 

of the sessionhandle struct, as that was not good.
parent 2f0bc9d1

lib/ftp.c

+3 −3
Original line number Diff line number Diff line
@@ -409,9 +409,9 @@ CURLcode Curl_ftp_connect(struct connectdata *conn) 
  /* get some initial data into the ftp struct */

  ftp->bytecountp = &conn->bytecount;



  /* no need to duplicate them, the data struct won't change */

  ftp->user = data->state.user;

  ftp->passwd = data->state.passwd;

  /* no need to duplicate them, this connectdata struct won't change */

  ftp->user = conn->user;

  ftp->passwd = conn->passwd;

  ftp->response_time = 3600; /* set default response time-out */



  if (data->set.tunnel_thru_httpproxy) {

lib/http.c

+1 −2
Original line number Diff line number Diff line
@@ -650,8 +650,7 @@ static CURLcode Curl_output_basic(struct connectdata *conn) 
  char *authorization;

  struct SessionHandle *data=conn->data;



  sprintf(data->state.buffer, "%s:%s",

          data->state.user, data->state.passwd);

  sprintf(data->state.buffer, "%s:%s", conn->user, conn->passwd);

  if(Curl_base64_encode(data->state.buffer, strlen(data->state.buffer),

                        &authorization) >= 0) {

    if(conn->allocptr.userpwd)

lib/http_digest.c

+5 −5
Original line number Diff line number Diff line
@@ -154,18 +154,18 @@ CURLcode Curl_output_digest(struct connectdata *conn, 
  if(data->state.digest.algo == CURLDIGESTALGO_MD5SESS) {

    md5this = (unsigned char *)

      aprintf("%s:%s:%s:%s:%s",

              data->state.user,

              conn->user,

              data->state.digest.realm,

              data->state.passwd,

              conn->passwd,

              data->state.digest.nonce,

              data->state.digest.cnonce);

  }

  else {

    md5this = (unsigned char *)

      aprintf("%s:%s:%s",

              data->state.user,

              conn->user,

              data->state.digest.realm,

              data->state.passwd);

              conn->passwd);

  }

  Curl_md5it(md5buf, md5this);

  free(md5this); /* free this again */
@@ -202,7 +202,7 @@ CURLcode Curl_output_digest(struct connectdata *conn, 
             "nonce=\"%s\", "

             "uri=\"%s\", "

             "response=\"%s\"\r\n",

             data->state.user,

             conn->user,

             data->state.digest.realm,

             data->state.digest.nonce,

             uripath, /* this is the PATH part of the URL */

lib/http_ntlm.c

+9 −6
Original line number Diff line number Diff line
@@ -271,7 +271,6 @@ static void mkhash(char *password, 
/* this is for creating ntlm header output */

CURLcode Curl_output_ntlm(struct connectdata *conn)

{

  struct SessionHandle *data=conn->data;

  const char *domain=""; /* empty */

  const char *host=""; /* empty */

  int domlen=strlen(domain);
@@ -339,6 +338,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn) 
    size = Curl_base64_encode(ntlm, size, &base64);



    if(size >0 ) {

      if(conn->allocptr.userpwd)

        free(conn->allocptr.userpwd);

      conn->allocptr.userpwd = aprintf("Authorization: NTLM %s\r\n",

                                       base64);

      free(base64);
@@ -377,20 +378,20 @@ CURLcode Curl_output_ntlm(struct connectdata *conn) 
    const char *user;

    int userlen;



    user = strchr(data->state.user, '\\');

    user = strchr(conn->user, '\\');

    if(!user)

      user = strchr(data->state.user, '/');

      user = strchr(conn->user, '/');



    if (user) {

      domain = data->state.user;

      domain = conn->user;

      domlen = user - domain;

      user++;

    }

    else

      user = data->state.user;

      user = conn->user;

    userlen = strlen(user);



    mkhash(data->state.passwd, &conn->ntlm.nonce[0], lmresp

    mkhash(conn->passwd, &conn->ntlm.nonce[0], lmresp

#ifdef USE_NTRESPONSES

           , ntresp

#endif
@@ -510,6 +511,8 @@ CURLcode Curl_output_ntlm(struct connectdata *conn) 
    size = Curl_base64_encode(ntlm, size, &base64);



    if(size >0 ) {

      if(conn->allocptr.userpwd)

        free(conn->allocptr.userpwd);

      conn->allocptr.userpwd = aprintf("Authorization: NTLM %s\r\n",

                                       base64);

      free(base64);

lib/krb4.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ CURLcode Curl_krb_kauth(struct connectdata *conn) 


  save = Curl_set_command_prot(conn, prot_private);



  result = Curl_ftpsendf(conn, "SITE KAUTH %s", conn->data->state.user);

  result = Curl_ftpsendf(conn, "SITE KAUTH %s", conn->user);



  if(result)

    return result;