X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/a832773496d46caa5e328d36a15b4918f24a804e..df0870fc8ceb5a8fea66a4d0fe00e7db12317e33:/console.c

diff --git a/console.c b/console.c
index 703e6837..039716c6 100644
--- a/console.c
+++ b/console.c
@@ -15,6 +15,8 @@
 
 int console_batch_mode = FALSE;
 
+static void *console_logctx = NULL;
+
 /*
  * Clean up and exit.
  */
@@ -26,12 +28,10 @@ void cleanup_exit(int code)
     sk_cleanup();
     WSACleanup();
 
-    if (cfg.protocol == PROT_SSH) {
-	random_save_seed();
+    random_save_seed();
 #ifdef MSCRYPTOAPI
-	crypto_wrapup();
+    crypto_wrapup();
 #endif
-    }
 
     exit(code);
 }
@@ -47,14 +47,14 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"The server's host key is not cached in the registry. You\n"
 	"have no guarantee that the server is the computer you\n"
 	"think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"Connection abandoned.\n";
     static const char absentmsg[] =
 	"The server's host key is not cached in the registry. You\n"
 	"have no guarantee that the server is the computer you\n"
 	"think it is.\n"
-	"The server's key fingerprint is:\n"
+	"The server's %s key fingerprint is:\n"
 	"%s\n"
 	"If you trust this host, enter \"y\" to add the key to\n"
 	"PuTTY's cache and carry on connecting.\n"
@@ -71,7 +71,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"server administrator has changed the host key, or you\n"
 	"have actually connected to another computer pretending\n"
 	"to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"Connection abandoned.\n";
     static const char wrongmsg[] =
@@ -81,7 +81,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 	"server administrator has changed the host key, or you\n"
 	"have actually connected to another computer pretending\n"
 	"to be the server.\n"
-	"The new key fingerprint is:\n"
+	"The new %s key fingerprint is:\n"
 	"%s\n"
 	"If you were expecting this change and trust the new key,\n"
 	"enter \"y\" to update PuTTY's cache and continue connecting.\n"
@@ -106,18 +106,18 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     if (ret == 2) {		       /* key was different */
 	if (console_batch_mode) {
-	    fprintf(stderr, wrongmsg_batch, fingerprint);
+	    fprintf(stderr, wrongmsg_batch, keytype, fingerprint);
 	    cleanup_exit(1);
 	}
-	fprintf(stderr, wrongmsg, fingerprint);
+	fprintf(stderr, wrongmsg, keytype, fingerprint);
 	fflush(stderr);
     }
     if (ret == 1) {		       /* key was absent */
 	if (console_batch_mode) {
-	    fprintf(stderr, absentmsg_batch, fingerprint);
+	    fprintf(stderr, absentmsg_batch, keytype, fingerprint);
 	    cleanup_exit(1);
 	}
-	fprintf(stderr, absentmsg, fingerprint);
+	fprintf(stderr, absentmsg, keytype, fingerprint);
 	fflush(stderr);
     }
 
@@ -137,6 +137,10 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     }
 }
 
+void update_specials_menu(void *frontend)
+{
+}
+
 /*
  * Ask whether the selected cipher is acceptable (since it was
  * below the configured 'warn' threshold).
@@ -192,7 +196,7 @@ void askcipher(void *frontend, char *ciphername, int cs)
  * Ask whether to wipe a session log file before writing to it.
  * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
  */
-int askappend(void *frontend, char *filename)
+int askappend(void *frontend, Filename filename)
 {
     HANDLE hin;
     DWORD savemode, i;
@@ -212,15 +216,12 @@ int askappend(void *frontend, char *filename)
 
     char line[32];
 
-    if (cfg.logxfovr != LGXF_ASK) {
-	return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
-    }
     if (console_batch_mode) {
-	fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename);
+	fprintf(stderr, msgtemplate_batch, FILENAME_MAX, filename.path);
 	fflush(stderr);
 	return 0;
     }
-    fprintf(stderr, msgtemplate, FILENAME_MAX, filename);
+    fprintf(stderr, msgtemplate, FILENAME_MAX, filename.path);
     fflush(stderr);
 
     hin = GetStdHandle(STD_INPUT_HANDLE);
@@ -264,8 +265,15 @@ void old_keyfile_warning(void)
     fputs(message, stderr);
 }
 
-void logevent(void *frontend, char *string)
+void console_provide_logctx(void *logctx)
+{
+    console_logctx = logctx;
+}
+
+void logevent(void *frontend, const char *string)
 {
+    if (console_logctx)
+	log_eventlog(console_logctx, string);
 }
 
 int console_get_line(const char *prompt, char *str,