Author: jkupec Date: Sun Sep 28 12:42:44 2008 New Revision: 11189 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11189&view=rev Log: - preset username for auth callback from CM data Modified: trunk/libzypp/zypp/media/MediaCurl.cc Modified: trunk/libzypp/zypp/media/MediaCurl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaCurl.cc?r... ============================================================================== --- trunk/libzypp/zypp/media/MediaCurl.cc (original) +++ trunk/libzypp/zypp/media/MediaCurl.cc Sun Sep 28 12:42:44 2008 @@ -1599,8 +1599,6 @@ // if not found, ask user else { - // reset credentials from CM (they're wrong, obviously) - cmcred.reset(); CurlAuthData_Ptr curlcred; curlcred.reset(new CurlAuthData()); @@ -1609,6 +1607,12 @@ // preset the username if present in current url if (!_url.getUsername().empty() && firstTry) curlcred->setUsername(_url.getUsername()); + // if CM has found some credentials, preset the username from there + else if (cmcred) + curlcred->setUsername(cmcred->username()); + + // indicate we have no good credentials from CM + cmcred.reset(); string prompt_msg = boost::str(boost::format( //!\todo add comma to the message for the next release -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org