svnno****@sourc*****
svnno****@sourc*****
2010年 12月 18日 (土) 22:04:43 JST
Tera TermRevision: 4229
http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4229
Author: maya
Date: 2010-12-18 22:04:43 +0900 (Sat, 18 Dec 2010)
Log Message:
-----------
SSH エージェント転é€ã®è¦æ±‚ãŒã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã‹ã‚‰æ¥ãŸã¨ãã€Pageant ã«å–り次ãã‹ã©ã†ã‹ãƒ¦ãƒ¼ã‚¶ã«ç¢ºèªã™ã‚‹ã‚ˆã†ã«ã—ãŸã€‚
クライアントã‹ã‚‰ CHANNEL_OPEN ãŒæ¥ãŸæ™‚点㧠MessageBox ã‚’ã¯ã•ã‚“ã§ã„ã‚‹
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/installer/release/TERATERM.INI
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/ttssh2/ttxssh/fwd.c
trunk/ttssh2/ttxssh/fwd.h
trunk/ttssh2/ttxssh/resource.h
trunk/ttssh2/ttxssh/ssh.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
trunk/ttssh2/ttxssh/ttxssh.rc
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/en/html/about/history.html 2010-12-18 13:04:43 UTC (rev 4229)
@@ -1614,7 +1614,7 @@
<ul class="history">
<!-- li>Changes
<ul>
- <li></li>
+ <li>SSHƒG[ƒWƒFƒ“ƒg“]‘—‚ð—v‹‚³‚ꂽ‚Æ‚«‚ÉAŽó‚¯“ü‚ê‚é‚©‚Ç‚¤‚©ƒ†[ƒU‚ÉŠm”F‚·‚é‹@”\‚ð’ljÁ‚µ‚½B</li>
</ul>
</li -->
Modified: trunk/doc/en/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/en/html/menu/setup-ssh.html 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/en/html/menu/setup-ssh.html 2010-12-18 13:04:43 UTC (rev 4229)
@@ -48,6 +48,11 @@
<dd>
The SSH agent forwarding is enabled using by the Pageant application.
</dd>
+
+ <dt>Confirm agent forwarding</dt>
+ <!--dd>
+ ƒŠƒ‚[ƒg‚©‚ç SSH ƒG[ƒWƒFƒ“ƒg“]‘—‚ª—v‹‚³‚ꂽ‚Æ‚«A—v‹‚ɉž‚¦‚Ä Pageant ‚É–â‚¢‡‚킹‚é‚©‚Ç‚¤‚©ƒ†[ƒU‚ÉŠm”F‚µ‚Ü‚·B
+ </dd-->
</dl>
</body>
</html>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/ja/html/about/history.html 2010-12-18 13:04:43 UTC (rev 4229)
@@ -1614,11 +1614,11 @@
<h3><a name="ttssh_2.56">2011.xx.xx (Ver 2.56)</a></h3>
<ul class="history">
- <!-- li>•ÏX
+ <li>•ÏX
<ul>
- <li></li>
+ <li>SSHƒG[ƒWƒFƒ“ƒg“]‘—‚ð—v‹‚³‚ꂽ‚Æ‚«‚ÉAŽó‚¯“ü‚ê‚é‚©‚Ç‚¤‚©ƒ†[ƒU‚ÉŠm”F‚·‚é‹@”\‚ð’ljÁ‚µ‚½B</li>
</ul>
- </li -->
+ </li>
<li>ƒoƒOC³
<ul>
Modified: trunk/doc/ja/html/menu/setup-ssh.html
===================================================================
--- trunk/doc/ja/html/menu/setup-ssh.html 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/doc/ja/html/menu/setup-ssh.html 2010-12-18 13:04:43 UTC (rev 4229)
@@ -46,6 +46,11 @@
<dd>
Pageant ‚ð—˜—p‚µ‚½ SSH ƒG[ƒWƒFƒ“ƒg“]‘—‚ð—LŒø‚É‚µ‚Ü‚·B
</dd>
+
+ <dt>Confirm agent forwarding</dt>
+ <dd>
+ ƒŠƒ‚[ƒg‚©‚ç SSH ƒG[ƒWƒFƒ“ƒg“]‘—‚ª—v‹‚³‚ꂽ‚Æ‚«A—v‹‚ɉž‚¦‚Ä Pageant ‚É–â‚¢‡‚킹‚é‚©‚Ç‚¤‚©ƒ†[ƒU‚ÉŠm”F‚µ‚Ü‚·B
+ </dd>
</dl>
</body>
</html>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/TERATERM.INI 2010-12-18 13:04:43 UTC (rev 4229)
@@ -649,6 +649,9 @@
; SSH agent forwarding (pageant) (1=enabled 0=disabled)
ForwardAgent=0
+; Confirm SSH agent forwarding (1=enabled 0=disabled)
+ForwardAgentConfirm=1
+
[TTProxy]
ConnectionTimeout="10"
SocksResolve="auto"
Modified: trunk/installer/release/lang/English.lng
===================================================================
--- trunk/installer/release/lang/English.lng 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/English.lng 2010-12-18 13:04:43 UTC (rev 4229)
@@ -615,6 +615,7 @@
DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 to turn off)
DLG_SSHSETUP_PASSWORD=Remember password on &memory
DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
DLG_SSHSETUP_NOTICE=All options take effect the next time a session is started.
FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
@@ -663,6 +664,7 @@
MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
; hosts.c
MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.
Modified: trunk/installer/release/lang/French.lng
===================================================================
--- trunk/installer/release/lang/French.lng 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/French.lng 2010-12-18 13:04:43 UTC (rev 4229)
@@ -614,6 +614,7 @@
DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 pour éteindre)
DLG_SSHSETUP_PASSWORD=Garder mot de passe en mémoire
DLG_SSHSETUP_FORWARDAGENT=Activer &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
DLG_SSHSETUP_NOTICE=Toutes options actives prochaine ouverture de session
FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choisir un fichier hôtes connus en R/W
@@ -662,6 +663,7 @@
MSG_FWD_DENIED_X_ERROR=Le serveur a essayé de rediriger une connexion à travers cette machine.\nIl a demandé une connexion au serveur X local.\nVous n'aviez pas spécifié cette redirection par avance à TTSSH, par conséquent la requête a été refusée.
MSG_FWD_DENIED_BY_SERVER_ERROR=Un programme sur la machine locale a essayé de se connecter à un port redirigé.\nLa demande de redirection a été refusée par le serveur. La connexion a été fermée.
MSG_FWD_COMM_ERROR=Une erreur de communication est survenue lors de l'envoi de données redirigées vers un port local.\nLa connexion redirigée va être fermée.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
; hosts.c
MSG_HOSTS_READ_ENOENT_ERROR=Une erreur est apparue lors d'une tentative de lecture d'un fichier d'hôtes connus.\nLe nom de fichier n'existe pas.
Modified: trunk/installer/release/lang/German.lng
===================================================================
--- trunk/installer/release/lang/German.lng 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/German.lng 2010-12-18 13:04:43 UTC (rev 4229)
@@ -612,6 +612,7 @@
DLG_SSHSETUP_HEARTBEAT=HeartBeat(&keep-alive)
DLG_SSHSETUP_HEARTBEAT_UNIT=sec.(0 to turn off)
DLG_SSHSETUP_FORWARDAGENT=Enable &agent forwarding
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=C&onfirm agent forwarding
DLG_SSHSETUP_NOTICE=Die Einstellungen werden beim Start der nächsten Sitzung aktiv.
FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=Choose a read/write known-hosts file
@@ -660,6 +661,7 @@
MSG_FWD_DENIED_X_ERROR=The server attempted to forward a connection through this machine.\nIt requested a connection to the local X server.\nYou did not specify this forwarding to TTSSH in advance, and therefore the request was denied.
MSG_FWD_DENIED_BY_SERVER_ERROR=A program on the local machine attempted to connect to a forwarded port.\nThe forwarding request was denied by the server. The connection has been closed.
MSG_FWD_COMM_ERROR=A communications error occurred while sending forwarded data to a local port.\nThe forwarded connection will be closed.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=Accept agent forwading request?
; hosts.c
MSG_HOSTS_READ_ENOENT_ERROR=An error occurred while trying to read a known_hosts file.\nThe specified filename does not exist.
Modified: trunk/installer/release/lang/Japanese.lng
===================================================================
--- trunk/installer/release/lang/Japanese.lng 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/installer/release/lang/Japanese.lng 2010-12-18 13:04:43 UTC (rev 4229)
@@ -615,6 +615,7 @@
DLG_SSHSETUP_HEARTBEAT_UNIT=•b(0‚ðŽw’è‚·‚é‚Æ–³Œø)
DLG_SSHSETUP_PASSWORD=ƒpƒXƒ[ƒh‚ðƒƒ‚ƒŠã‚É‹L‰¯‚·‚é(&M)
DLG_SSHSETUP_FORWARDAGENT=ƒG[ƒWƒFƒ“ƒg“]‘—‚ð—LŒø‚É‚·‚é(&A)
+DLG_SSHSETUP_FORWARDAGENTCONFIRM=ƒG[ƒWƒFƒ“ƒg“]‘—‚ðŠm”F‚·‚é(&O)
DLG_SSHSETUP_NOTICE=‚¢‚¸‚ê‚Ì•ÏX‚àŽŸ‰ñ‚̃ZƒbƒVƒ‡ƒ“ˆÈ~—LŒø‚É‚È‚è‚Ü‚·.
FILEDLG_OPEN_KNOWNHOSTS_RW_TITLE=“Ç‚Ý‘‚«—pknownhostsƒtƒ@ƒCƒ‹‚ð‘I‘ð‚µ‚Ä‚‚¾‚³‚¢
@@ -663,6 +664,7 @@
MSG_FWD_DENIED_X_ERROR=ƒT[ƒo‚Í‚±‚̃}ƒVƒ“‚É“]‘—‚ðŽŽ‚Ý‚Ü‚µ‚½.\nƒ[ƒJƒ‹‚ÌX ƒT[ƒo‚Ö‚ÌÚ‘±‚ð—v‹‚µ‚Ü‚µ‚½.\nTTSSH ‚ÉŠY“–‚·‚é“]‘—ݒ肪‘¶Ý‚µ‚È‚¢‚½‚ß, —v‹‚ð‹‘”Û‚µ‚Ü‚µ‚½.
MSG_FWD_DENIED_BY_SERVER_ERROR=ƒ[ƒJƒ‹ƒ}ƒVƒ“ã‚̃vƒƒOƒ‰ƒ€‚Í“]‘—æƒ|[ƒg‚ÉÚ‘±‚µ‚Ü‚µ‚½.\n“]‘——v‹‚̓T[ƒo‘¤‚Å‹‘”Û‚³‚ê‚Ü‚µ‚½. Ú‘±‚ð•Â‚¶‚Ü‚·.
MSG_FWD_COMM_ERROR=ƒ[ƒJƒ‹ƒ|[ƒg‚É“]‘—ƒf[ƒ^‚ð‘—M’†, ’ÊMƒGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½.\n“]‘—Ú‘±‚ð•Â‚¶‚Ü‚·.
+MSG_FWD_AGENT_FORWARDING_CONFIRM=ƒG[ƒWƒFƒ“ƒg“]‘——v‹‚ðŽó‚¯“ü‚ê‚Ü‚·‚©H
; hosts.c
MSG_HOSTS_READ_ENOENT_ERROR=known_hosts “Ç‚Ýž‚Ý’†‚ɃGƒ‰[‚ª”¶‚µ‚Ü‚µ‚½. \nŽw’肳‚ꂽƒtƒ@ƒCƒ‹–¼‚Í‘¶Ý‚µ‚Ü‚¹‚ñ.
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/fwd.c 2010-12-18 13:04:43 UTC (rev 4229)
@@ -1914,3 +1914,22 @@
DestroyWindow(pvar->fwd_state.accept_wnd);
}
}
+
+BOOL FWD_agent_forword_confirm(PTInstVar pvar)
+{
+ HWND cur_active = GetActiveWindow();
+ pvar->session_settings.ForwardAgentConfirm = 1;
+ if (pvar->session_settings.ForwardAgentConfirm) {
+ UTIL_get_lang_msg("MSG_FWD_AGENT_FORWARDING_CONFIRM", pvar,
+ "Accept agent forwading request?");
+ if (MessageBox(cur_active != NULL ? cur_active : pvar->NotificationWindow,
+ pvar->ts->UIMsg, "TTSSH",
+ MB_YESNO | MB_ICONQUESTION | MB_DEFBUTTON2) == IDYES) {
+ return TRUE;
+ }
+ else {
+ return FALSE;
+ }
+ }
+ return TRUE;
+}
Modified: trunk/ttssh2/ttxssh/fwd.h
===================================================================
--- trunk/ttssh2/ttxssh/fwd.h 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/fwd.h 2010-12-18 13:04:43 UTC (rev 4229)
@@ -168,5 +168,6 @@
void FWD_free_channel(PTInstVar pvar, uint32 local_channel_num);
int FWD_check_local_channel_num(PTInstVar pvar, int local_num);
int FWD_agent_open(PTInstVar pvar, uint32 remote_channel_num);
+BOOL FWD_agent_forword_confirm(PTInstVar pvar);
#endif
Modified: trunk/ttssh2/ttxssh/resource.h
===================================================================
--- trunk/ttssh2/ttxssh/resource.h 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/resource.h 2010-12-18 13:04:43 UTC (rev 4229)
@@ -81,6 +81,7 @@
#define IDC_FORWARDAGENT 1055
#define IDC_TTSSH_VERSION 1056
#define IDC_FORWARD_AGENT 1056
+#define IDC_FORWARDAGENTCONFIRM 1056
#define IDC_RSA1_TYPE 1057
#define IDC_RSA_TYPE 1058
#define IDC_DSA_TYPE 1059
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ssh.c 2010-12-18 13:04:43 UTC (rev 4229)
@@ -1961,7 +1961,7 @@
int remote_id = get_payload_uint32(pvar, 0);
int local_id;
- if (pvar->agentfwd_enable) {
+ if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
local_id = FWD_agent_open(pvar, remote_id);
if (local_id == -1) {
SSH_fail_channel_open(pvar, remote_id);
@@ -8914,7 +8914,7 @@
c->remote_maxpacket = remote_maxpacket;
} else if (strcmp(ctype, "auth-****@opens*****") == 0) { // agent forwarding
- if (pvar->agentfwd_enable) {
+ if (pvar->agentfwd_enable && FWD_agent_forword_confirm(pvar)) {
c = ssh2_channel_new(CHAN_TCP_WINDOW_DEFAULT, CHAN_TCP_PACKET_DEFAULT, TYPE_AGENT, chan_num);
if (c == NULL) {
UTIL_get_lang_msg("MSG_SSH_NO_FREE_CHANNEL", pvar,
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2010-12-18 13:04:43 UTC (rev 4229)
@@ -363,6 +363,9 @@
// agent forward ‚ð—LŒø‚É‚·‚é (2008.11.25 maya)
settings->ForwardAgent = read_BOOL_option(fileName, "ForwardAgent", FALSE);
+ // agent forward Šm”F‚ð—LŒø‚É‚·‚é
+ settings->ForwardAgentConfirm = read_BOOL_option(fileName, "ForwardAgentConfirm", TRUE);
+
clear_local_settings(pvar);
}
@@ -439,6 +442,10 @@
// agent forward ‚ð—LŒø‚É‚·‚é (2008.11.25 maya)
WritePrivateProfileString("TTSSH", "ForwardAgent",
settings->ForwardAgent ? "1" : "0", fileName);
+
+ // agent forward Šm”F‚ð—LŒø‚É‚·‚é
+ WritePrivateProfileString("TTSSH", "ForwardAgentConfirm",
+ settings->ForwardAgentConfirm ? "1" : "0", fileName);
}
@@ -2459,6 +2466,9 @@
GetDlgItemText(dlg, IDC_FORWARDAGENT, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_SSHSETUP_FORWARDAGENT", pvar, uimsg);
SetDlgItemText(dlg, IDC_FORWARDAGENT, pvar->ts->UIMsg);
+ 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_NOTICEBANNER, uimsg, sizeof(uimsg));
UTIL_get_lang_msg("DLG_SSHSETUP_NOTICE", pvar, uimsg);
SetDlgItemText(dlg, IDC_NOTICEBANNER, pvar->ts->UIMsg);
@@ -2516,6 +2526,12 @@
if (pvar->settings.ForwardAgent) {
CheckDlgButton(dlg, IDC_FORWARDAGENT, TRUE);
}
+ else {
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), FALSE);
+ }
+ if (pvar->settings.ForwardAgentConfirm) {
+ CheckDlgButton(dlg, IDC_FORWARDAGENTCONFIRM, TRUE);
+ }
}
void get_teraterm_dir_relative_name(char FAR * buf, int bufsize,
@@ -2656,6 +2672,7 @@
pvar->settings.remember_password = IsDlgButtonChecked(dlg, IDC_REMEMBERPASSWORD);
pvar->settings.ForwardAgent = IsDlgButtonChecked(dlg, IDC_FORWARDAGENT);
+ pvar->settings.ForwardAgentConfirm = IsDlgButtonChecked(dlg, IDC_FORWARDAGENTCONFIRM);
}
static void move_cur_sel_delta(HWND listbox, int delta)
@@ -2784,6 +2801,7 @@
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, IDC_FORWARDAGENTCONFIRM, 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));
}
@@ -2827,6 +2845,14 @@
case IDC_CHOOSEREADONLYFILE:
choose_read_only_file(dlg);
return TRUE;
+ case IDC_FORWARDAGENT:
+ if (!IsDlgButtonChecked(dlg, IDC_FORWARDAGENT)) {
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), FALSE);
+ }
+ else {
+ EnableWindow(GetDlgItem(dlg, IDC_FORWARDAGENTCONFIRM), TRUE);
+ }
+ return TRUE;
}
break;
}
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2010-12-18 13:04:43 UTC (rev 4229)
@@ -135,6 +135,9 @@
// Enable Agent forwarding
BOOL ForwardAgent;
+
+ // Confirm Agent forwarding
+ BOOL ForwardAgentConfirm;
} TS_SSH;
typedef struct _TInstVar {
Modified: trunk/ttssh2/ttxssh/ttxssh.rc
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.rc 2010-12-17 07:53:37 UTC (rev 4228)
+++ trunk/ttssh2/ttxssh/ttxssh.rc 2010-12-18 13:04:43 UTC (rev 4229)
@@ -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, 269
+IDD_SSHSETUP DIALOGEX 0, 0, 223, 282
STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "TTSSH: Setup"
FONT 8, "Tahoma", 0, 0, 0x0
@@ -148,20 +148,22 @@
LISTBOX IDC_SSHCIPHERPREFS,31,45,159,60,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
PUSHBUTTON "Move &Up",IDC_SSHMOVECIPHERUP,43,110,58,13,WS_GROUP
PUSHBUTTON "Move &Down",IDC_SSHMOVECIPHERDOWN,117,110,58,13
- GROUPBOX "SSH Known Hosts",IDC_KNOWNHOSTS,7,138,209,52
- PUSHBUTTON "Read/&write file:",IDC_CHOOSEREADWRITEFILE,14,149,63,14
- EDITTEXT IDC_READWRITEFILENAME,83,150,126,13,ES_AUTOHSCROLL | WS_GROUP
- PUSHBUTTON "&Read-only files:",IDC_CHOOSEREADONLYFILE,14,167,63,14
- EDITTEXT IDC_READONLYFILENAME,83,168,126,13,ES_AUTOHSCROLL | WS_GROUP
- 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
+ GROUPBOX "SSH Known Hosts",IDC_KNOWNHOSTS,7,134,209,52
+ PUSHBUTTON "Read/&write file:",IDC_CHOOSEREADWRITEFILE,14,145,63,14
+ EDITTEXT IDC_READWRITEFILENAME,83,146,126,13,ES_AUTOHSCROLL | WS_GROUP
+ PUSHBUTTON "&Read-only files:",IDC_CHOOSEREADONLYFILE,14,163,63,14
+ EDITTEXT IDC_READONLYFILENAME,83,164,126,13,ES_AUTOHSCROLL | WS_GROUP
+ LTEXT "HeartBeat(&keep-alive)",IDC_HEARTBEATLABEL,17,193,83,8
+ EDITTEXT IDC_HEARTBEAT_EDIT,102,191,26,14,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
+ LTEXT "sec.(0 to turn off)",IDC_HEARTBEATLABEL2,134,193,77,8
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
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,207,187,10
+ CONTROL "Enable &agent forwarding",IDC_FORWARDAGENT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,221,187,10
+ CONTROL "C&onfirm agent forwarding",IDC_FORWARDAGENTCONFIRM,
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,235,187,10
+ LTEXT "All options take effect the next time a session is started.",IDC_NOTICEBANNER,17,249,187,12
+ DEFPUSHBUTTON "OK",IDOK,49,263,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,119,263,50,14
END
IDD_SSHUNKNOWNHOST DIALOGEX 0, 0, 215, 242
@@ -390,7 +392,10 @@
IDD_SSHSETUP, DIALOG
BEGIN
- BOTTOMMARGIN, 267
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 216
+ TOPMARGIN, 4
+ BOTTOMMARGIN, 277
END
IDD_SSHUNKNOWNHOST, DIALOG