svnno****@sourc*****
svnno****@sourc*****
2017年 4月 11日 (火) 02:52:49 JST
Tera TermRevision: 6677
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6677
Author: doda
Date: 2017-04-11 02:52:48 +0900 (Tue, 11 Apr 2017)
Log Message:
-----------
エージェントへのアクセス通知を設定ダイアログで設定できるようにした。
Modified Paths:
--------------
trunk/installer/release/lang/English.lng
trunk/installer/release/lang/French.lng
trunk/installer/release/lang/German.lng
trunk/installer/release/lang/Japanese.lng
trunk/installer/release/lang/Korean.lng
trunk/installer/release/lang/Russian.lng
trunk/installer/release/lang/Simplified Chinese.lng
trunk/installer/release/lang/Traditional Chinese.lng
trunk/ttssh2/ttxssh/resource.h
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/English.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -721,6 +721,7 @@
DLG_SSHSETUP_PASSWORD=Remember password on &memory
DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
DLG_SSHSETUP_NOTICE=All options take effect the next time a session is started.
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/French.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -721,6 +721,7 @@
DLG_SSHSETUP_PASSWORD=Garder mot de passe en m\xE9moire
DLG_SSHSETUP_FORWARDAGENT=Activer &agent forwarding
DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
DLG_SSHSETUP_NOTICE=Toutes options actives prochaine ouverture de session
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/German.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -720,6 +720,7 @@
DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 to turn off)
DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=&Verify hostkey fingerprint by DNS
DLG_SSHSETUP_NOTICE=Die Einstellungen werden beim Start der n\xE4chsten Sitzung aktiv.
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/Japanese.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -721,6 +721,7 @@
DLG_SSHSETUP_PASSWORD=\x83p\x83X\x83\x8F\x81[\x83h\x82\xF0\x83\x81\x83\x82\x83\x8A\x8F\xE3\x82ɋL\x89\xAF\x82\xB7\x82\xE9(&M)
DLG_SSHSETUP_FORWARDAGENT=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9(&A)
DLG_SSHSETUP_FORWARDAGENTCONFIRM=\x83G\x81[\x83W\x83F\x83\x93\x83g\x93]\x91\x97\x82\xF0\x8Am\x94F\x82\xB7\x82\xE9(&O)
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=\x93]\x91\x97\x82\xB5\x82\xBD\x83G\x81[\x83W\x83F\x83\x93\x83g\x82̗\x98\x97p\x82\xF0\x92ʒm\x82\xB7\x82\xE9(&T)
DLG_SSHSETUP_VERIFYHOSTKEYDNS=\x83z\x83X\x83g\x83L\x81[\x82̌\xAE\x8Ew\x96\xE4\x82\xF0DNS\x82Ŋm\x94F\x82\xB7\x82\xE9(&V)
DLG_SSHSETUP_NOTICE=\x82\xA2\x82\xB8\x82\xEA\x82̕ύX\x82\xE0\x8E\x9F\x89\xF1\x82̃Z\x83b\x83V\x83\x87\x83\x93\x88ȍ~\x97L\x8C\xF8\x82ɂȂ\xE8\x82܂\xB7.
DLG_SSHSETUP_HOSTKEY_ROTATION=\x83z\x83X\x83g\x8C\xF6\x8AJ\x8C\xAE\x82̎\xA9\x93\xAE\x8DX\x90V(&N)
Modified: trunk/installer/release/lang/Korean.lng
===================================================================
--- trunk/installer/release/lang/Korean.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/Korean.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -721,6 +721,7 @@
DLG_SSHSETUP_PASSWORD=\xB8\xA1 \xBE\xCFȣ \xB1\xE2\xBE\xEF(&M)
DLG_SSHSETUP_FORWARDAGENT=agent \xC6\xF7\xBF\xF6\xB5\xF9 Ȱ\xBC\xBAȭ(&A)
DLG_SSHSETUP_FORWARDAGENTCONFIRM=agent \xC6\xF7\xBF\xF6\xB5\xF9 Ȯ\xC0\xCE(&O)
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xB7\xCE ȣ\xBD\xBAƮŰ \xC1\xF6\xB9\xAE\xC0\xBB \xB0\xCB\xC1\xF5(&V)
DLG_SSHSETUP_NOTICE=\xB8\xF0\xB5\xE7 \xBC\xB3\xC1\xA4\xC0\xBA \xB4\xD9\xC0\xBD \xBC\xBC\xBC\xC7\xC0\xCC \xBD\xC3\xC0۵\xC9 \xB6\xA7 \xB9ݿ\xB5\xB5˴ϴ\xD9.
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/Russian.lng
===================================================================
--- trunk/installer/release/lang/Russian.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/Russian.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -722,6 +722,7 @@
DLG_SSHSETUP_PASSWORD=&\xC7\xE0\xEF\xEE\xEC\xED\xE8\xF2\xFC \xEF\xE0\xF0\xEE\xEB\xFC \xE2 \xEF\xE0\xEC\xFF\xF2\xE8
DLG_SSHSETUP_FORWARDAGENT=&\xC2\xEA\xEB\xFE\xF7\xE8\xF2\xFC \xE0\xE3\xE5\xED\xF2 \xEF\xE5\xF0\xE5\xF1\xFB\xEB\xEA\xE8
DLG_SSHSETUP_FORWARDAGENTCONFIRM=&\xCF\xEE\xE4\xF2\xE2\xE5\xF0\xE4\xE8\xF2\xFC \xE0\xE3\xE5\xED\xF2\xE0 \xEF\xE5\xF0\xE5\xF1\xFB\xEB\xEA\xE8
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=&\xCF\xF0\xEE\xE2\xE5\xF0\xE8\xF2\xFC \xEA\xEB\xFE\xF7 \xF5\xEE\xF1\xF2\xE0 \xE2 DNS
DLG_SSHSETUP_NOTICE=\xC2\xF1\xE5 \xEF\xE0\xF0\xE0\xEC\xE5\xF2\xF0\xFB \xE2\xF1\xF2\xF3\xEF\xFF\xF2 \xE2 \xF1\xE8\xEB\xF3 \xE2 \xF1\xEB\xE5\xE4\xF3\xFE\xF9\xE5\xE9 \xF1\xE5\xF1\xF1\xE8\xE8.
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/Simplified Chinese.lng
===================================================================
--- trunk/installer/release/lang/Simplified Chinese.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/Simplified Chinese.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -722,6 +722,7 @@
DLG_SSHSETUP_PASSWORD=\xB1\xA3\xB4\xE6\xD4\xDA\xC4ڴ\xE6\xD6е\xC4\xC3\xDC\xC2\xEB(&M)
DLG_SSHSETUP_FORWARDAGENT=\xC6\xF4\xD3ô\xFA\xC0\xEDת\xB7\xA2(&A)
DLG_SSHSETUP_FORWARDAGENTCONFIRM=ȷ\xC8ϴ\xFA\xC0\xEDת\xB7\xA2(&O)
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xD1\xE9֤\xD6\xF7\xBB\xFA\xC3\xDCԿָ\xCE\xC6(&V)
DLG_SSHSETUP_NOTICE=\xCB\xF9\xD3и\xFC\xB8Ķ\xBC\xBD\xAB\xD4\xDA\xCF´λỰʱ\xC9\xFAЧ\xA1\xA3
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/installer/release/lang/Traditional Chinese.lng
===================================================================
--- trunk/installer/release/lang/Traditional Chinese.lng 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/installer/release/lang/Traditional Chinese.lng 2017-04-10 17:52:48 UTC (rev 6677)
@@ -722,6 +722,7 @@
DLG_SSHSETUP_PASSWORD=\xC0x\xA6s\xA6b\xB0O\xBE\xD0\xC5餤\xAA\xBA\xB1K\xBDX(&M)
DLG_SSHSETUP_FORWARDAGENT=\xB1ҥΥN\xB2z\xC2\xE0\xB5o(&A)
DLG_SSHSETUP_FORWARDAGENTCONFIRM=\xBDT\xBB{\xA5N\xB2z\xC2\xE0\xB5o(&O)
+DLG_SSHSETUP_FORWARDAGENTNOTIFY=No&tify access to the forwarded agent
DLG_SSHSETUP_VERIFYHOSTKEYDNS=DNS\xC5\xE7\xC3ҥD\xBE\xF7\xB1K\xC6_\xAB\xFC\xAF\xBE(&V)
DLG_SSHSETUP_NOTICE=\xA9Ҧ\xB3\xA7\xF3\xA7ﳣ\xB1N\xA6b\xA4U\xA6\xB8\xB3s\xBDu\xAEɥͮġC
DLG_SSHSETUP_HOSTKEY_ROTATION=Hostkey rotatio&n
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/ttssh2/ttxssh/resource.h 2017-04-10 17:52:48 UTC (rev 6677)
@@ -217,6 +217,7 @@
#define IDC_FP_HASH_ALG 1217
#define IDC_FP_HASH_ALG_MD5 1218
#define IDC_FP_HASH_ALG_SHA256 1219
+#define IDC_FORWARDAGENTNOTIFY 1220
// Next default values for new objects
//
@@ -224,7 +225,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 114
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1220
+#define _APS_NEXT_CONTROL_VALUE 1221
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2017-04-10 17:52:48 UTC (rev 6677)
@@ -2891,6 +2891,9 @@
GetDlgItemText(dlg, IDC_FORWARDAGENTCONFIRM, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENTCONFIRM", pvar, uimsg);
SetDlgItemText(dlg, IDC_FORWARDAGENTCONFIRM, pvar->ts->UIMsg);
+ GetDlgItemText(dlg, IDC_FORWARDAGENTNOTIFY, uimsg, sizeof(uimsg));
+ UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENTNOTIFY", pvar, uimsg);
+ SetDlgItemText(dlg, IDC_FORWARDAGENTNOTIFY, pvar->ts->UIMsg);
GetDlgItemText(dlg, IDC_VERIFYHOSTKEYDNS, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_SSHSETUP_VERIFYHOSTKEYDNS", pvar, uimsg);
SetDlgItemText(dlg, IDC_VERIFYHOSTKEYDNS, pvar->ts->UIMsg);
@@ -3046,6 +3049,9 @@
if (pvar->settings.ForwardAgentConfirm) {
CheckDlgButton(dlg, IDC_FORWARDAGENTCONFIRM, TRUE);
}
+ if (pvar->settings.ForwardAgentNotify) {
+ CheckDlgButton(dlg, IDC_FORWARDAGENTNOTIFY, TRUE);
+ }
if (pvar->settings.VerifyHostKeyDNS) {
CheckDlgButton(dlg, IDC_VERIFYHOSTKEYDNS, TRUE);
}
@@ -3312,6 +3318,7 @@
pvar->settings.remember_password = IsDlgButtonChecked(dlg, IDC_REMEMBERPASSWORD);
pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);
+ pvar->settings.ForwardAgentNotify = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTNOTIFY);
pvar->settings.VerifyHostKeyDNS = IsDlgButtonChecked(dlg, IDC_VERIFYHOSTKEYDNS);
// hostkey rotation(OpenSSH 6.8)
@@ -3470,6 +3477,7 @@
SendDlgItemMessage(dlg, IDC_REMEMBERPASSWORD, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_FORWARDAGENT, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_FORWARDAGENTCONFIRM, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
+ SendDlgItemMessage(dlg, IDC_FORWARDAGENTNOTIFY, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_VERIFYHOSTKEYDNS, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDC_NOTICEBANNER, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
SendDlgItemMessage(dlg, IDOK, WM_SETFONT, (WPARAM)DlgSetupFont, MAKELPARAM(TRUE,0));
@@ -3578,9 +3586,11 @@
case IDC_FORWARDAGENT:
if (!IsDlgButtonChecked(dlg, IDC_FORWARDAGENT)) {
EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), FALSE);
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), FALSE);
}
else {
EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), TRUE);
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTNOTIFY), TRUE);
}
return TRUE;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2017-04-10 17:52:44 UTC (rev 6676)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2017-04-10 17:52:48 UTC (rev 6677)
@@ -138,9 +138,11 @@
CONTROL "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,208,187,10
CONTROL "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,222,187,10
+ CONTROL "No&tify access to the forwarded agent",IDC_FORWARDAGENTNOTIFY,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,236,187,10
CONTROL "&Verify hostkey fingerprint by DNS",IDC_VERIFYHOSTKEYDNS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,236,187,10
- LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,250,187,12
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,250,187,10
+ LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,216,250,187,12
GROUPBOX "K&EX order (SSH2 only)",IDC_KEX_ORDER,216,8,187,98
LISTBOX IDC_SSHKEX_LIST,230,20,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Move Up(&3)",IDC_SSHKEX_MOVEUP,242,85,58,13,WS_GROUP