[Ttssh2-commit] [3396] パスワードの保存を設定できるようにした。

svnno****@sourc***** svnno****@sourc*****
2009年 5月 13日 (水) 00:46:28 JST


Revision: 3396
          http://svn.sourceforge.jp/view?root=ttssh2&view=rev&rev=3396
Author:   maya
Date:     2009-05-13 00:46:28 +0900 (Wed, 13 May 2009)

Log Message:
-----------
パスワードの保存を設定できるようにした。
  SSH Authentication ダイアログ終了時に、ForwardAgent は pvar->settings に保存しないが remember_password は保存しており、食い違いが生じている。

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/menu/setup-ssh.html
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/menu/setup-ssh.html
    trunk/ttssh2/ttxssh/resource.h
    trunk/ttssh2/ttxssh/ttxssh.c
    trunk/ttssh2/ttxssh/ttxssh.rc


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/doc/en/html/about/history.html	2009-05-12 15:46:28 UTC (rev 3396)
@@ -1262,6 +1262,7 @@
       <li>added a user can select a folder receiving a file on the SCP dialog.</li>
       <li>added a dialog that confirms overwriting a file received via SCP.</li>
       <li>use <a href="../menu/setup-sshauth.html">the default user name</a> when <a href="../commandline/ttssh.html#user">the user name</a> is not specified in <a href="../commandline/ttssh.html#auth">autologin mode</a>.</li>
+      <!--li>ƒpƒXƒ[ƒh‚ðƒƒ‚ƒŠ‚É•Û‘¶‚·‚é‚©‚Ç‚¤‚©Ý’è‚Å‚«‚é‚悤A<a href="../menu/setup-ssh.html">SSH Setup ƒ_ƒCƒAƒƒO</a>‚Ƀ`ƒFƒbƒNƒ{ƒbƒNƒX‚ð’ljÁ‚µ‚½B</li-->
     </ul>
   </li>
   <li>Bug fixes

Modified: trunk/doc/en/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/en/html/menu/setup-ssh.html	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/doc/en/html/menu/setup-ssh.html	2009-05-12 15:46:28 UTC (rev 3396)
@@ -39,6 +39,11 @@
 	this feature is disabled.
       </dd>
 
+      <dt>Remember password in memory</dt>
+      <!--dd>
+	”FØ‚ɐ¬Œ÷‚µ‚½ƒpƒXƒ[ƒh‚ðƒƒ‚ƒŠã‚É•Û‘¶‚µ‚Ü‚·B•Û‘¶‚³‚ꂽƒpƒXƒ[ƒh‚Í "Duplicate session" ‚ð‚µ‚½‚Æ‚«‚ÉŽg—p‚³‚ê‚Ü‚·B
+      </dd-->
+
       <dt>Enable agent forwarding</dt>
       <dd>
       The SSH agent forwarding is enabled using by the Pageant application.

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/doc/ja/html/about/history.html	2009-05-12 15:46:28 UTC (rev 3396)
@@ -1264,6 +1264,7 @@
       <li>SCP ‚̃tƒ@ƒCƒ‹ŽóMƒtƒHƒ‹ƒ_‚ð‘I‘ð‚Å‚«‚é‚悤‚É‚µ‚½B</li>
       <li>SCP ‚̃tƒ@ƒCƒ‹ŽóMŽž‚ɁA“¯–¼ƒtƒ@ƒCƒ‹‚ª‚ ‚Á‚½ê‡‚ɏ㏑‚«Šm”F‚·‚é‚悤‚É‚µ‚½B</li>
       <li><a href="../commandline/ttssh.html#auth">Ž©“®ƒƒOƒCƒ“</a>Žž‚É<a href="../commandline/ttssh.html#user">ƒ†[ƒU–¼</a>‚ªŽw’肳‚ê‚Ä‚¢‚È‚¢ê‡A<a href="../menu/setup-sshauth.html">ƒfƒtƒHƒ‹ƒg‚̃†[ƒU–¼</a>‚ðŽg‚¤‚悤‚É‚µ‚½B</li>
+      <li>ƒpƒXƒ[ƒh‚ðƒƒ‚ƒŠ‚É•Û‘¶‚·‚é‚©‚Ç‚¤‚©Ý’è‚Å‚«‚é‚悤A<a href="../menu/setup-ssh.html">SSH Setup ƒ_ƒCƒAƒƒO</a>‚Ƀ`ƒFƒbƒNƒ{ƒbƒNƒX‚ð’ljÁ‚µ‚½B</li>
     </ul>
   </li>
   <li>ƒoƒOC³

Modified: trunk/doc/ja/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/ja/html/menu/setup-ssh.html	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/doc/ja/html/menu/setup-ssh.html	2009-05-12 15:46:28 UTC (rev 3396)
@@ -37,6 +37,11 @@
 	i“Á‚É NAT ŠÂ‹«‰º‚Å—LŒøBj0‚ðŽw’è‚·‚é‚Æ“–ŠY‹@”\‚𖳌ø‰»‚µ‚Ü‚·B
       </dd>
 
+      <dt>Remember password in memory</dt>
+      <dd>
+	”FØ‚ɐ¬Œ÷‚µ‚½ƒpƒXƒ[ƒh‚ðƒƒ‚ƒŠã‚É•Û‘¶‚µ‚Ü‚·B•Û‘¶‚³‚ꂽƒpƒXƒ[ƒh‚Í "Duplicate session" ‚ð‚µ‚½‚Æ‚«‚ÉŽg—p‚³‚ê‚Ü‚·B
+      </dd>
+
       <dt>Enable agent forwarding</dt>
       <dd>
 	Pageant ‚ð—˜—p‚µ‚½ SSH ƒG[ƒWƒFƒ“ƒg“]‘—‚ð—LŒø‚É‚µ‚Ü‚·B

Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/ttssh2/ttxssh/resource.h	2009-05-12 15:46:28 UTC (rev 3396)
@@ -153,6 +153,7 @@
 #define IDC_SSHUSETIS                   1204
 #define IDC_SSHUSEPAGEANT               1205
 #define IDC_SSHUSETIS2                  1206
+#define IDC_REMEMBERPASSWORD            1207
 
 // Next default values for new objects
 // 
@@ -160,7 +161,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        108
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1105
+#define _APS_NEXT_CONTROL_VALUE         1208
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/ttssh2/ttxssh/ttxssh.c	2009-05-12 15:46:28 UTC (rev 3396)
@@ -2288,6 +2288,9 @@
 	GetDlgItemText(dlg, IDC_HEARTBEATLABEL2, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_HEARTBEAT_UNIT", pvar, uimsg);
 	SetDlgItemText(dlg, IDC_HEARTBEATLABEL2, pvar->ts->UIMsg);
+	GetDlgItemText(dlg, IDC_REMEMBERPASSWORD, uimsg, sizeof(uimsg));
+	UTIL_get_lang_msg("DLG_SSHSETUP_PASSWORD", pvar, uimsg);
+	SetDlgItemText(dlg, IDC_REMEMBERPASSWORD, pvar->ts->UIMsg);
 	GetDlgItemText(dlg, IDC_FORWARDAGENT, uimsg, sizeof(uimsg));
 	UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENT", pvar, uimsg);
 	SetDlgItemText(dlg, IDC_FORWARDAGENT, pvar->ts->UIMsg);
@@ -2342,6 +2345,9 @@
 		SetDlgItemText(dlg, IDC_HEARTBEAT_EDIT, buf);
 	}
 
+	if (pvar->settings.remember_password) {
+		CheckDlgButton(dlg, IDC_REMEMBERPASSWORD, TRUE);
+	}
 	if (pvar->settings.ForwardAgent) {
 		CheckDlgButton(dlg, IDC_FORWARDAGENT, TRUE);
 	}
@@ -2483,6 +2489,7 @@
 		i = 60;
 	pvar->settings.ssh_heartbeat_overtime = i;
 
+	pvar->settings.remember_password = IsDlgButtonChecked(dlg, IDC_REMEMBERPASSWORD);
 	pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
 }
 
@@ -2610,6 +2617,7 @@
 			SendDlgItemMessage(dlg, IDC_HEARTBEATLABEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_HEARTBEAT_EDIT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_HEARTBEATLABEL2, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+			SendDlgItemMessage(dlg, IDC_REMEMBERPASSWORD, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDC_FORWARDAGENT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
 			SendDlgItemMessage(dlg, IDCANCEL, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));

Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc	2009-05-12 14:57:28 UTC (rev 3395)
+++ trunk/ttssh2/ttxssh/ttxssh.rc	2009-05-12 15:46:28 UTC (rev 3396)
@@ -135,7 +135,7 @@
     CONTROL         "S&erial",IDC_HOSTSERIAL,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,8,89,37,8
 END
 
-IDD_SSHSETUP DIALOGEX 0, 0, 223, 255
+IDD_SSHSETUP DIALOGEX 0, 0, 223, 269
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "TTSSH: Setup"
 FONT 8, "Tahoma", 400, 0, 0x0
@@ -156,10 +156,12 @@
     LTEXT           "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,196,83,8
     EDITTEXT        IDC_HEARTBEAT_EDIT,102,194,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
     LTEXT           "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,196,77,8
-    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,210,187,10
-    DEFPUSHBUTTON   "OK",IDOK,49,239,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,119,239,50,14
-    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,224,187,12
+    CONTROL         "Remember password in &memory",IDC_REMEMBERPASSWORD,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,210,187,10
+    CONTROL         "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,224,187,10
+    DEFPUSHBUTTON   "OK",IDOK,49,253,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,119,253,50,14
+    LTEXT           "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,238,187,12
 END
 
 IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 242
@@ -373,7 +375,7 @@
 
     IDD_SSHSETUP, DIALOG
     BEGIN
-        BOTTOMMARGIN, 253
+        BOTTOMMARGIN, 267
     END
 
     IDD_SSHUNKNOWNHOST, DIALOG



Ttssh2-commit メーリングリストの案内