[8086] チケット38959 (Ttssh2-commit) - Tera Term

Revision: 8086
          https://osdn.net/projects/ttssh2/scm/svn/commits/8086
Author:   yutakapon
Date:     2019-09-07 21:18:28 +0900 (Sat, 07 Sep 2019)
Log Message:
-----------
チケット38959
ユーザ認証ダイアログの表示タイミングをknown_hostsダイアログの後に変更した。

branches/ttssh_improvedからリビジョン8027をマージ:
ProxyやNAT経由でサーバに接続できない場合、すでに切断状態にも関わらず、
認証ダイアログが表示されたままとなる問題を修正した。



........

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/ttssh2/ttxssh/auth.c
    trunk/ttssh2/ttxssh/ssh.c
    trunk/ttssh2/ttxssh/ttxssh.c

Property Changed:
----------------
    trunk/

-------------- next part --------------
Index: trunk
===================================================================

--- trunk	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk	2019-09-07 12:18:28 UTC (rev 8086)

Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -4,6 +4,6 ##
 /branches/portfwd_memleak:7732,7736-7737,7764
 /branches/ssh_ed25519:5495-5544
 /branches/ttproxy_improved:8041,8055-8056
-/branches/ttssh_improved:8040
+/branches/ttssh_improved:8027,8040
 /branches/vs2015_warn:6194-6285
 /tags/teraterm-4_89:6182
\ No newline at end of property
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk/doc/en/html/about/history.html	2019-09-07 12:18:28 UTC (rev 8086)
@@ -53,6 +53,7 @@
 
   <li>Misc
     <ul>
+      <li>upgraded TTSSH to <a href="#ttssh_2.91">2.91</a>.</li>
       <li>upgraded TTProxy to <a href="#ttproxy_1.0.0.26">1.0.0.26</a>.</li>
     </ul>
   </li>
@@ -3197,8 +3198,15 @@
   <li>Changes
     <ul>
       <li>Changed of indication from "Protocol" to "IP version" and from "UNSPEC" to "AUTO" on <a href="../menu/file-new.html">New connection dialog</a>.</li>
+      <li>The display timing of the user authentication dialog is changed to display after the known_hosts dialog.</li>
     </ul>
   </li>
+
+  <li>Bug fixes
+    <ul>
+      <li></li>
+    </ul>
+  </li>
 </ul>
 
 <h3 id="ttssh_2.90">2019.08.31 (Ver 2.90)</h3>

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk/doc/ja/html/about/history.html	2019-09-07 12:18:28 UTC (rev 8086)
@@ -53,6 +53,7 @@
 
   <li>\x82\xBB\x82̑\xBC
     <ul>
+      <li><a href="#ttssh_2.91">TTSSH(2.91)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
       <li><a href="#ttproxy_1.0.0.26">TTProxy(1.0.0.26)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
     </ul>
   </li>
@@ -3203,8 +3204,15 @@
   <li>\x95ύX
     <ul>
       <li><a href="../menu/file-new.html">New connection\x83_\x83C\x83A\x83\x8D\x83O</a>\x82̕\\x8BL\x82\xF0\x81uProtocol\x81v\x82\xA9\x82\xE7\x81uIP version\x81v\x82ɁA\x81uUNSPEC\x81v\x82\xF0\x81uAUTO\x81v\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
+      <li>\x83\x86\x81[\x83U\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82̕\\x8E\xA6\x83^\x83C\x83~\x83\x93\x83O\x82\xF0known_hosts\x83_\x83C\x83A\x83\x8D\x83O\x82̌\xE3\x82ɕύX\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
+
+  <li>\x83o\x83O\x8FC\x90\xB3
+    <ul>
+      <li></li>
+    </ul>
+  </li>
 </ul>
 
 <h3 id="ttssh_2.90">2019.08.31 (Ver 2.90)</h3>

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk/ttssh2/ttxssh/auth.c	2019-09-07 12:18:28 UTC (rev 8086)
@@ -1316,6 +1316,8 @@
 
 void AUTH_advance_to_next_cred(PTInstVar pvar)
 {
+	logprintf(LOG_LEVEL_VERBOSE, "User authentication will be shown by %d method.", pvar->auth_state.cur_cred.method);
+
 	pvar->auth_state.failed_method = pvar->auth_state.cur_cred.method;
 
 	if (pvar->auth_state.cur_cred.method == SSH_AUTH_NONE) {

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk/ttssh2/ttxssh/ssh.c	2019-09-07 12:18:28 UTC (rev 8086)
@@ -2936,6 +2936,10 @@
 	if ((pvar->ssh_state.status_flags & STATUS_HOST_OK) == 0) {
 		pvar->ssh_state.status_flags |= STATUS_HOST_OK;
 		send_session_key(pvar);
+		// \x83\x86\x81[\x83U\x94F\x8F؂\xF0\x8Ds\x82\xC1\x82Ă悢\x83^\x83C\x83~\x83\x93\x83O\x82ɂȂ\xC1\x82Ă\xA9\x82\xE7\x81A\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x8C\xBB\x82\xB3\x82\xB9\x82\xE9\x81B
+		// STATUS_HOST_OK\x82\xAA\x97\xA7\x82\xBF\x81ASTATUS_DONT_SEND_USER_NAME\x82\xAA\x97\x8E\x82\xBF\x82Ă\xA2\x82Ȃ\xA2\x82ƁA
+		// \x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82͎\xC0\x8E\xBF\x8Eg\x82\xA6\x82Ȃ\xA2\x82̂ŁA\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ŗ\xE2\x91\xE8\x82Ȃ\xA2\x81B
+		AUTH_advance_to_next_cred(pvar);
 	}
 }
 

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2019-09-07 11:26:53 UTC (rev 8085)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2019-09-07 12:18:28 UTC (rev 8086)
@@ -795,7 +795,11 @@
 
 		if (pvar->NotificationWindow == NULL) {
 			pvar->NotificationWindow = hWnd;
-			AUTH_advance_to_next_cred(pvar);
+			// AUTH_advance_to_next_cred()\x82̌Ăяo\x82\xB5\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
+			// NotificationWindow\x82Ƀn\x83\x93\x83h\x83\x8B\x82͐ݒ肵\x82Ă\xA8\x82\xAD\x82\xAA\x81A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82ł\xCD
+			// \x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x82̂͑\x81\x82\xB7\x82\xAC\x82\xBD\x81BProxy\x82\xE2NAT\x8Co\x97R\x82ŃT\x81[\x83o\x82ɐڑ\xB1
+			// \x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x81A\x82\xB7\x82łɐؒf\x8F\xF3\x91Ԃɂ\xE0\x8Aւ\xED\x82炸\x81A\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xAA
+			// \x95\\x8E\xA6\x82\xB3\x82ꂽ\x82܂܂ƂȂ\xC1\x82Ă\xA2\x82\xBD\x81B
 		}
 	}
 


Tera Term

[Ttssh2-commit] [8086] チケット38959