aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilmer van der Gaast <wilmer@gaast.net>2011-12-24 19:12:15 +0100
committerWilmer van der Gaast <wilmer@gaast.net>2011-12-24 19:12:15 +0100
commit9a1c14d8b636510242f81558f7f0a43918636865 (patch)
tree5ee714ae952bf617980aa7122c59ba2da2a33da5
parent34ded90e19635c7ebf2afd184f36b03abc879bec (diff)
An empty password is still a password, don't refuse accounts for that.
-rw-r--r--lib/arc.c2
-rw-r--r--storage_xml.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/arc.c b/lib/arc.c
index fd498454..1bd5cf87 100644
--- a/lib/arc.c
+++ b/lib/arc.c
@@ -199,7 +199,7 @@ int arc_decode( unsigned char *crypt, int crypt_len, char **clear, char *passwor
if( clear_len < 0 )
{
*clear = g_strdup( "" );
- return 0;
+ return -1;
}
/* Prepare buffers and the key + IV */
diff --git a/storage_xml.c b/storage_xml.c
index af77190e..0525fef5 100644
--- a/storage_xml.c
+++ b/storage_xml.c
@@ -149,7 +149,7 @@ static void xml_start_element( GMarkupParseContext *ctx, const gchar *element_na
g_set_error( error, G_MARKUP_ERROR, G_MARKUP_ERROR_INVALID_CONTENT,
"Unknown protocol: %s", protocol );
else if( ( pass_len = base64_decode( pass_b64, (unsigned char**) &pass_cr ) ) &&
- arc_decode( pass_cr, pass_len, &password, xd->given_pass ) )
+ arc_decode( pass_cr, pass_len, &password, xd->given_pass ) >= 0 )
{
xd->current_account = account_add( irc->b, prpl, handle, password );
if( server )