[Ttssh2-commit] [4759] SSH 認証に失敗して SSH Authentication ダイアログが再表示されたとき、最初に表示されたときに入力されていたユーザ名ではなく SSH 設定のデフォルトユーザ名が User name に入力される問題を修正

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2011年 12月 1日 (木) 12:45:38 JST


Revision: 4759
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4759
Author:   maya
Date:     2011-12-01 12:45:38 +0900 (Thu, 01 Dec 2011)
Log Message:
-----------
SSH 認証に失敗して SSH Authentication ダイアログが再表示されたとき、最初に表示されたときに入力されていたユーザ名ではなく SSH 設定のデフォルトユーザ名が User name に入力される問題を修正

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

-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/doc/en/html/about/history.html	2011-12-01 03:45:38 UTC (rev 4759)
@@ -1775,6 +1775,7 @@
   <li>Changes
     <ul>
       <li>When the SSH version of the TTSSH does not match the server protocol version, a user can not connect.</li>
+      <li>The control characters(^A-^_) can be inputed as the password string on the key generator dialog.</li>
       <li>added the <a href="../usage/ssh.html#SSHFP">SSHFP RR</a> on the <a href="../usage/ssh.html#securitywarning">Security Warning</a> dialog.
         <ul>
           <li>added the "Verify hostkey fingerprint by DNS" checkbox on the "<a href="../menu/setup-ssh.html">TTSSH: Setup</a>" dialog box.</li>
@@ -1785,10 +1786,10 @@
 
   <li>Bug fixes
     <ul>
-      <li>The control characters(^A-^_) can be inputed as the password string on the key generator dialog.</li>
       <li>When the server protocol is 1.99, Tera Term will connect with the SSH2 protocol by using the SSH1 specified protocol.</li>
+      <li>When the transfering display number is an integer other than zero, the X11 forwaring does not work well.</li>
+      <!--li>\x94F\x8F؂Ɏ\xB8\x94s\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82̃\x86\x81[\x83U\x96\xBC\x82ɁA\x8Dŏ\x89\x82ɓ\xFC\x97͂\xB5\x82\xBD\x83\x86\x81[\x83U\x96\xBC\x82ł͂Ȃ\xAD\x83f\x83t\x83H\x83\x8B\x83g\x82̃\x86\x81[\x83U\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li-->
       <li>When the SSHFP verification is enabled and the SSHFP RR does not query, the application fault will occur.</li>
-      <li>When the transfering display number is an integer other than zero, the X11 forwaring does not work well.</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/doc/ja/html/about/history.html	2011-12-01 03:45:38 UTC (rev 4759)
@@ -1776,6 +1776,7 @@
   <li>\x95ύX
     <ul>
       <li>\x83T\x81[\x83o\x82̃v\x83\x8D\x83g\x83R\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93\x82Ǝw\x92肵\x82\xBD SSH \x82̃o\x81[\x83W\x83\x87\x83\x93\x82\xAA\x88\xEA\x92v\x82\xB5\x82Ȃ\xA2\x8Fꍇ\x81A\x90ڑ\xB1\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+      <li>\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82ɐ\xA7\x8C䕶\x8E\x9A(^A-^_)\x82\xF0\x93\xFC\x97͂ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
       <li>\x83z\x83X\x83g\x8C\xAE\x82̊m\x94F(<a href="../usage/ssh.html#securitywarning">\x83Z\x83L\x83\x85\x83\x8A\x83e\x83B\x8Cx\x8D\x90</a>)\x83_\x83C\x83A\x83\x8D\x83O\x82\xC9<a href="../usage/ssh.html#SSHFP">DNS\x82\xCCSSHFP RR\x82ɂ\xE6\x82錟\x8F،\x8B\x89ʂ\xF0\x95\\x8E\xA6\x82\xB7\x82\xE9\x8B@\x94\</a>\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B
         <ul>
           <li>"<a href="../menu/setup-ssh.html">SSH \x90ݒ\xE8</a>" \x83_\x83C\x83A\x83\x8D\x83O\x82Ƀ`\x83F\x83b\x83N\x83{\x83b\x83N\x83X(Verify hostkey fingerprint by DNS)\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
@@ -1786,10 +1787,10 @@
 
   <li>\x83o\x83O\x8FC\x90\xB3
     <ul>
-      <li>\x8C\xAE\x90\xB6\x90\xAC\x83_\x83C\x83A\x83\x8D\x83O\x82Ńp\x83X\x83\x8F\x81[\x83h\x82ɐ\xA7\x8C䕶\x8E\x9A(^A-^_)\x82\xF0\x93\xFC\x97͂ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
       <li>\x83T\x81[\x83o\x82̃v\x83\x8D\x83g\x83R\x83\x8B\x83o\x81[\x83W\x83\x87\x83\x93\x82\xAA 1.99 \x82̏ꍇ\x82ɁA\x83v\x83\x8D\x83g\x83R\x83\x8B\x82\xC9 SSH1 \x82\xF0\x8Ew\x92肵\x82Ă\xE0 SSH2 \x82Őڑ\xB1\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>X11\x93]\x91\x97\x82ŁA\x93]\x91\x97\x90\xE6\x82̃f\x83B\x83X\x83v\x83\x8C\x83C\x94ԍ\x86\x82\xAA0\x88ȊO\x82̎\x9E\x82ɐ\xB3\x82\xB5\x82\xAD\x93]\x91\x97\x8Fo\x97\x88\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>\x94F\x8F؂Ɏ\xB8\x94s\x82\xB5\x82\xBD\x82Ƃ\xAB\x82ɕ\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82̃\x86\x81[\x83U\x96\xBC\x82ɁA\x8Dŏ\x89\x82ɓ\xFC\x97͂\xB5\x82\xBD\x83\x86\x81[\x83U\x96\xBC\x82ł͂Ȃ\xAD\x83f\x83t\x83H\x83\x8B\x83g\x82̃\x86\x81[\x83U\x96\xBC\x82\xAA\x93\xFC\x97͂\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
       <li>\x83z\x83X\x83g\x8C\xAE\x82\xCCSSHFP\x8C\x9F\x8F؂\xF0\x97L\x8C\xF8\x82ɂ\xB5\x82Ă\xA2\x82鎞\x82ɁASSHFP RR \x82\xAA\x88\xF8\x82\xAF\x82Ȃ\xA2\x82ƃA\x83v\x83\x8A\x83P\x81[\x83V\x83\x87\x83\x93\x83G\x83\x89\x81[\x82ɂȂ\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
-      <li>X11\x93]\x91\x97\x82ŁA\x93]\x91\x97\x90\xE6\x82̃f\x83B\x83X\x83v\x83\x8C\x83C\x94ԍ\x86\x82\xAA0\x88ȊO\x82̎\x9E\x82ɐ\xB3\x82\xB5\x82\xAD\x93]\x91\x97\x8Fo\x97\x88\x82Ȃ\xA9\x82\xC1\x82\xBD\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: trunk/ttssh2/ttxssh/auth.c
===================================================================
--- trunk/ttssh2/ttxssh/auth.c	2011-11-30 15:42:19 UTC (rev 4758)
+++ trunk/ttssh2/ttxssh/auth.c	2011-12-01 03:45:38 UTC (rev 4759)
@@ -267,7 +267,7 @@
 		EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);
 		EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAMELABEL), FALSE);
 	}
-	if (strlen(pvar->ssh2_username) > 0) {
+	else if (strlen(pvar->ssh2_username) > 0) {
 		SetDlgItemText(dlg, IDC_SSHUSERNAME, pvar->ssh2_username);
 		if (pvar->ssh2_autologin == 1) {
 			EnableWindow(GetDlgItem(dlg, IDC_SSHUSERNAME), FALSE);



Ttssh2-commit メーリングリストの案内
Back to archive index