# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1102561830 0
# Node ID 114d3ac8ff5a8d4da89cf377fe98543ce76d374a
# Parent  20e750dd21a0b29bc754ecd18875f7c3d437dde3
[gaim-migrate @ 11543]
This should fix public key authentication for SILC if your key
is password protected.  It's a patch from Michele Baldessari.

committer: Tailor Script <tailor@pidgin.im>

diff -r 20e750dd21a0 -r 114d3ac8ff5a src/protocols/silc/ops.c
--- a/src/protocols/silc/ops.c	Thu Dec 09 02:55:18 2004 +0000
+++ b/src/protocols/silc/ops.c	Thu Dec 09 03:10:30 2004 +0000
@@ -1601,15 +1601,15 @@
 
 	/* Check configuration if we have this connection configured.  If we
 	   have then return that data immediately, as it's faster way. */
+	if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
+		completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
+		return;
+	}
 	if (gc->account->password && *gc->account->password) {
 		completion(TRUE, SILC_AUTH_PASSWORD, gc->account->password,
 			   strlen(gc->account->password), context);
 		return;
 	}
-	if (gaim_account_get_bool(sg->account, "pubkey-auth", FALSE)) {
-		completion(TRUE, SILC_AUTH_PUBLIC_KEY, NULL, 0, context);
-		return;
-	}
 
 	/* Resolve the authentication method from server, as we may not know it. */
 	internal = silc_calloc(1, sizeof(*internal));