From 264a9bc6ed650375243a5ab38d323fe385ea256e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 29 Jul 2002 22:45:50 +0000 Subject: 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. --- lib/url.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'lib/url.c') diff --git a/lib/url.c b/lib/url.c index 17cd79c9a..bbe28788d 100644 --- a/lib/url.c +++ b/lib/url.c @@ -1592,11 +1592,10 @@ 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, - "proxy password:", - data->state.proxypasswd, - sizeof(data->state.proxypasswd))) { + if(data->set.fpasswd( data->set.passwd_client, + "proxy password:", + data->state.proxypasswd, + sizeof(data->state.proxypasswd))) { failf(data, "Bad password from password callback"); return CURLE_BAD_PASSWORD_ENTERED; } @@ -2171,10 +2170,9 @@ 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, - "password:", data->state.passwd, - sizeof(data->state.passwd))) + if(data->set.fpasswd(data->set.passwd_client, + "password:", data->state.passwd, + sizeof(data->state.passwd))) return CURLE_BAD_PASSWORD_ENTERED; } -- cgit v1.2.3