Bug 1528: Display tunnel host name on Authentication dialog

https://winscp.net/tracker/1528 Source commit: 9823fc87d0d308e4e08b538acbaac80dc61b973a
winscp · Jan 28, 2018 · a9ba786 · a9ba786
1 parent 37ee3ab
commit a9ba786
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/source/core/Terminal.cpp b/source/core/Terminal.cpp
@@ -393,7 +393,8 @@ bool __fastcall TTunnelUI::PromptUser(TSessionData * Data, TPromptKind Kind,
   {
     if (IsAuthenticationPrompt(Kind))
     {
-      Instructions = LoadStr(TUNNEL_INSTRUCTION) +
+      Instructions =
+        FMTLOAD(TUNNEL_INSTRUCTION2, (Data->HostName)) +
         (Instructions.IsEmpty() ? L"" : L"\n") +
         Instructions;
     }

diff --git a/source/resource/TextsCore.h b/source/resource/TextsCore.h
@@ -299,7 +299,7 @@
 #define NEW_PASSWORD_CURRENT_PROMPT 340
 #define NEW_PASSWORD_NEW_PROMPT 341
 #define NEW_PASSWORD_CONFIRM_PROMPT 342
-#define TUNNEL_INSTRUCTION      343
+#define TUNNEL_INSTRUCTION2     343
 #define RENAME_TITLE            344
 #define RENAME_PROMPT2          345
 #define VERIFY_CERT_PROMPT3     346

diff --git a/source/resource/TextsCore1.rc b/source/resource/TextsCore1.rc
@@ -269,7 +269,7 @@ BEGIN
   NEW_PASSWORD_CURRENT_PROMPT, "&Current password:"
   NEW_PASSWORD_NEW_PROMPT, "&New password:"
   NEW_PASSWORD_CONFIRM_PROMPT, "Confirm new &password:"
-  TUNNEL_INSTRUCTION, "Tunnel session authentication"
+  TUNNEL_INSTRUCTION2, "Authenticating tunnel through %s"
   RENAME_TITLE, "Transfer under different name"
   RENAME_PROMPT2, "&New name:"
   VERIFY_CERT_PROMPT3, "**The server's certificate is not known. You have no guarantee that the server is the computer you think it is.**\n\nServer's certificate details follow:\n\n%s\n\nIf you trust this certificate, press Yes. To connect without storing certificate, press No. To abandon the connection press Cancel.\n\nContinue connecting and store the certificate?"