Commit 264a9bc6 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

Removed checks for if set.fpasswd is NULL, as we prevent users from setting 

it to NULL and then use the internal default instead. It will always be
a function to call.
parent f79f5cbf

lib/url.c

+7 −9
Original line number Diff line number Diff line
@@ -1592,8 +1592,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, 


    /* check for password, if no ask for one */

    if( !data->state.proxypasswd[0] ) {

      if(!data->set.fpasswd ||

         data->set.fpasswd( data->set.passwd_client,

      if(data->set.fpasswd( data->set.passwd_client,

                            "proxy password:",

                            data->state.proxypasswd,

                            sizeof(data->state.proxypasswd))) {
@@ -2171,8 +2170,7 @@ static CURLcode CreateConnection(struct SessionHandle *data, 
  /* if we have a user but no password, ask for one */

  if(conn->bits.user_passwd &&

     !data->state.passwd[0] ) {

    if(!data->set.fpasswd ||

      data->set.fpasswd(data->set.passwd_client,

    if(data->set.fpasswd(data->set.passwd_client,

                         "password:", data->state.passwd,

                         sizeof(data->state.passwd)))

      return CURLE_BAD_PASSWORD_ENTERED;