X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/d1622aed96258feca49be59e4459f4b29027492a..3d5c1aa6cc98142bafa7e110e064813eda8e4563:/windlg.c

diff --git a/windlg.c b/windlg.c
index 89aecba0..60d19052 100644
--- a/windlg.c
+++ b/windlg.c
@@ -392,14 +392,12 @@ static int CALLBACK LicenceProc (HWND hwnd, UINT msg,
       case WM_COMMAND:
 	switch (LOWORD(wParam)) {
 	  case IDOK:
-	    abtbox = NULL;
-	    DestroyWindow (hwnd);
+	    EndDialog(hwnd, 1);
 	    return 0;
 	}
 	return 0;
       case WM_CLOSE:
-	abtbox = NULL;
-	DestroyWindow (hwnd);
+	EndDialog(hwnd, 1);
 	return 0;
     }
     return 0;
@@ -1550,7 +1548,7 @@ void showabout (HWND hwnd) {
     }
 }
 
-void verify_ssh_host_key(char *host, char *keytype,
+void verify_ssh_host_key(char *host, int port, char *keytype,
                          char *keystr, char *fingerprint) {
     int ret;
 
@@ -1593,7 +1591,7 @@ void verify_ssh_host_key(char *host, char *keytype,
     /*
      * Verify the key against the registry.
      */
-    ret = verify_host_key(host, keytype, keystr);
+    ret = verify_host_key(host, port, keytype, keystr);
 
     if (ret == 0)                      /* success - key matched OK */
         return;
@@ -1603,7 +1601,7 @@ void verify_ssh_host_key(char *host, char *keytype,
         mbret = MessageBox(NULL, message, mbtitle,
                            MB_ICONWARNING | MB_YESNOCANCEL);
         if (mbret == IDYES)
-            store_host_key(host, keytype, keystr);
+            store_host_key(host, port, keytype, keystr);
         if (mbret == IDCANCEL)
             exit(0);
     }
@@ -1614,6 +1612,6 @@ void verify_ssh_host_key(char *host, char *keytype,
                            MB_ICONWARNING | MB_YESNO);
         if (mbret == IDNO)
             exit(0);
-        store_host_key(host, keytype, keystr);
+        store_host_key(host, port, keytype, keystr);
     }
 }