summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--common/gmountsource.c7
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c004cfbc..c4dfbccb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2008-03-05 Alexander Larsson <alexl@redhat.com>
+ * common/gmountsource.c:
+ (ask_password_reply):
+ Always set password to non-NULL, but keep
+ user/domain as NULL if not specified by user.
+ Fixes #520317 (smb auth crash)
+
+2008-03-05 Alexander Larsson <alexl@redhat.com>
+
* client/gdaemonmount.c:
(g_daemon_mount_eject_finish):
Initialize drive variable not access
diff --git a/common/gmountsource.c b/common/gmountsource.c
index 8445def9..bbf6d73f 100644
--- a/common/gmountsource.c
+++ b/common/gmountsource.c
@@ -221,7 +221,7 @@ ask_password_reply (DBusMessage *reply,
if (!anonymous)
{
- data->password = *password == 0 ? NULL : g_strdup (password);
+ data->password = g_strdup (password);
data->username = *username == 0 ? NULL : g_strdup (username);
data->domain = *domain == 0 ? NULL : g_strdup (domain);
}
@@ -311,8 +311,9 @@ g_mount_source_ask_password_async (GMountSource *source,
*
* Requests the reply parameters from a g_mount_source_ask_password_async()
* request. All out parameters can be set to %NULL to ignore them.
- * <note><para>Please be aware that all string parameters can be set to %NULL,
- * so make sure to check them.</para></note>
+ * <note><para>Please be aware that out parameters other than the password
+ * are set to %NULL if the user don't specify them so make sure to
+ * check them.</para></note>
*
* Returns: %FALSE if the async reply contained an error.
**/