Rearrange verify_ssh_host_key() for robustness in the face of strangeness, in

the same manner as windows/windlg.c (but tested this time :)

git-svn-id: svn://svn.tartarus.org/sgt/putty@5380 cda61777-01e9-0310-a592-d414129be87e

diff --git a/unix/gtkdlg.c b/unix/gtkdlg.c
index 8ab8598..97af792 100644 (file)
--- a/unix/gtkdlg.c
+++ b/unix/gtkdlg.c
@@ -2347,13 +2347,12 @@ int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     sfree(text);
 
-    if (ret == 0)
-        return 0;                      /* do not continue with connection */
-    else {
-        if (ret == 2)
-            store_host_key(host, port, keytype, keystr);
-        return 1;                      /* continue with connection */
-    }
+    if (ret == 2) {
+       store_host_key(host, port, keytype, keystr);
+       return 1;                      /* continue with connection */
+    } else if (ret == 1)
+       return 1;                      /* continue with connection */
+    return 0;                         /* do not continue with connection */
 }
 
 /*