summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-11-08 19:21:54 +0200
committerMikhail Zabaluev <mikhail.zabaluev@nokia.com>2011-11-08 19:25:27 +0200
commitd382e81e662b02f50a14bf43056e76dca5dfcaa5 (patch)
treec1adad850548be280d825a92c608174498e0985c
parent8104847b2dc0e4c0c47ace4d3f37029030355a79 (diff)
Don't prevent asking the client for a password in foreign realmsfix-auth
We are even more interested in prompting for this case than we are in the normal registration auth case. "extra-auth-user" is a hack from the time when we did not have ServerAuthentication.
-rw-r--r--src/sip-connection.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sip-connection.c b/src/sip-connection.c
index 5eb671c..22681d8 100644
--- a/src/sip-connection.c
+++ b/src/sip-connection.c
@@ -725,9 +725,6 @@ priv_handle_auth (RakiaConnection* self,
/* fall back to the main username */
user = priv->auth_user;
password = priv->extra_auth_password;
- if (password == NULL)
- /* note that this prevents asking the user for a password */
- password = "";
DEBUG("using the extra auth credentials");
}
@@ -790,8 +787,11 @@ priv_password_manager_prompt_cb (GObject *source_object,
password = password_string->str;
/* also save it for later. */
- g_free (priv->password);
- priv->password = g_strdup (password);
+ if (data->connection_auth)
+ {
+ g_free (priv->password);
+ priv->password = g_strdup (password);
+ }
priv_handle_auth_continue (data->self, data->nh, data->method,
data->realm, data->user, password);