nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-26 09:42:25 +00:00
Code Issues Projects Releases Wiki Activity

Tidy up the host key alerts a little, and swap the Just Once and Cancel

Browse Source 
buttons so that they appear in the standard action and cancel positions.

[originally from svn r5288]
This commit is contained in:
Owen Dunn 2005-02-11 18:01:59 +00:00
parent 07391f0f36
commit 3e8951c8c6
2 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mac/mac.c
View File

@ -724,10 +724,10 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
if (ret == 2) { /* key was different */ if (ret == 2) { /* key was different */
ParamText(pappname, pkeytype, pfingerprint, NULL); ParamText(pappname, pkeytype, pfingerprint, NULL);
alertret=CautionAlert(wWrong, NULL); alertret=CautionAlert(wWrong, NULL);
if (alertret == 9) { if (alertret == 8) {
/* Cancel */ /* Cancel */
goto cancel; goto cancel;
} else if (alertret == 8) { } else if (alertret == 9) {
/* Connect Just Once */ /* Connect Just Once */
} else { } else {
/* Update Key */ /* Update Key */
@ -737,10 +737,10 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
if (ret == 1) { /* key was absent */ if (ret == 1) { /* key was absent */
ParamText(pkeytype, pfingerprint, pappname, NULL); ParamText(pkeytype, pfingerprint, pappname, NULL);
alertret=CautionAlert(wAbsent, NULL); alertret=CautionAlert(wAbsent, NULL);
if (alertret == 8) { if (alertret == 7) {
/* Cancel */ /* Cancel */
goto cancel; goto cancel;
} else if (alertret == 7) { } else if (alertret == 8) {
/* Connect Just Once */ /* Connect Just Once */
} else { } else {
/* Update Key */ /* Update Key */

54
mac/mac_res.r
View File

@ -1008,7 +1008,7 @@ resource 'DITL' (wQuestion, "fatalbox", purgeable) {
/* Absent host key */ /* Absent host key */
resource 'ALRT' (wAbsent, "absent", purgeable) { resource 'ALRT' (wAbsent, "absent", purgeable) {
{32, 67, 332, 435}, {37, 67, 337, 435},
wAbsent, wAbsent,
beepStages, beepStages,
alertPositionMainScreen alertPositionMainScreen
@ -1017,7 +1017,7 @@ resource 'ALRT' (wAbsent, "absent", purgeable) {
resource 'DITL' (wAbsent, "absent", purgeable) { resource 'DITL' (wAbsent, "absent", purgeable) {
{ /* array DITLarray: 8 elements */ { /* array DITLarray: 8 elements */
/* [1] */ /* [1] */
{11, 72, 60, 357}, {10, 72, 60, 357},
StaticText { StaticText {
disabled, disabled,
"The server's host key is not cached. You " "The server's host key is not cached. You "
@ -1025,13 +1025,13 @@ resource 'DITL' (wAbsent, "absent", purgeable) {
"computer you think it is." "computer you think it is."
}, },
/* [2] */ /* [2] */
{65, 71, 113, 355}, {65, 72, 113, 355},
StaticText { StaticText {
disabled, disabled,
"The server's ^0 key fingerprint is:\n^1" "The server's ^0 key fingerprint is:\n^1"
}, },
/* [3] */ /* [3] */
{121, 70, 172, 354}, {121, 72, 172, 354},
StaticText { StaticText {
disabled, disabled,
"If you trust this host, hit Add Key to add " "If you trust this host, hit Add Key to add "
@ -1039,7 +1039,7 @@ resource 'DITL' (wAbsent, "absent", purgeable) {
"connecting." "connecting."
}, },
/* [4] */ /* [4] */
{178, 70, 226, 354}, {178, 72, 226, 354},
StaticText { StaticText {
disabled, disabled,
"If you want to carry on connecting just " "If you want to carry on connecting just "
@ -1047,29 +1047,29 @@ resource 'DITL' (wAbsent, "absent", purgeable) {
"select Just Once." "select Just Once."
}, },
/* [5] */ /* [5] */
{233, 69, 281, 353}, {233, 72, 271, 353},
StaticText { StaticText {
disabled, disabled,
"If you do not trust this host, hit Cancel " "If you do not trust this host, hit Cancel "
"to abandon the connection." "to abandon the connection."
}, },
/* [6] */ /* [6] */
{285, 70, 303, 139}, {275, 72, 295, 139},
Button { Button {
enabled, enabled,
"Add Key" "Add Key"
}, },
/* [7] */ /* [7] */
{285, 214, 305, 288}, {275, 217, 295, 277},
Button {
enabled,
"Just Once"
},
/* [8] */
{284, 295, 304, 354},
Button { Button {
enabled, enabled,
"Cancel" "Cancel"
},
/* [8] */
{275, 290, 295, 360},
Button {
enabled,
"Just Once"
} }
} }
}; };
@ -1086,7 +1086,7 @@ resource 'ALRT' (wWrong, "wrong", purgeable) {
resource 'DITL' (wWrong, "wrong", purgeable) { resource 'DITL' (wWrong, "wrong", purgeable) {
{ /* array DITLarray: 9 elements */ { /* array DITLarray: 9 elements */
/* [1] */ /* [1] */
{7, 74, 23, 358}, {10, 72, 26, 358},
StaticText { StaticText {
disabled, disabled,
"WARNING - POTENTIAL SECURITY BREACH!" "WARNING - POTENTIAL SECURITY BREACH!"
@ -1103,13 +1103,13 @@ resource 'DITL' (wWrong, "wrong", purgeable) {
"server." "server."
}, },
/* [3] */ /* [3] */
{142, 72, 190, 356}, {136, 72, 190, 356},
StaticText { StaticText {
disabled, disabled,
"The new ^1 key fingerprint is:\n^2" "The new ^1 key fingerprint is:\n^2"
}, },
/* [4] */ /* [4] */
{190, 73, 238, 357}, {190, 72, 238, 357},
StaticText { StaticText {
disabled, disabled,
"If you were expecting this change and " "If you were expecting this change and "
@ -1117,7 +1117,7 @@ resource 'DITL' (wWrong, "wrong", purgeable) {
"^0's cache and continue connecting." "^0's cache and continue connecting."
}, },
/* [5] */ /* [5] */
{246, 74, 294, 358}, {246, 72, 294, 358},
StaticText { StaticText {
disabled, disabled,
"If you want to carry on connecting just " "If you want to carry on connecting just "
@ -1125,7 +1125,7 @@ resource 'DITL' (wWrong, "wrong", purgeable) {
"select Just Once." "select Just Once."
}, },
/* [6] */ /* [6] */
{301, 74, 349, 358}, {301, 72, 349, 358},
StaticText { StaticText {
disabled, disabled,
"If you do not trust this host, hit Cancel " "If you do not trust this host, hit Cancel "
@ -1133,22 +1133,22 @@ resource 'DITL' (wWrong, "wrong", purgeable) {
"ONLY guaranteed safe choice." "ONLY guaranteed safe choice."
}, },
/* [7] */ /* [7] */
{361, 76, 379, 163}, {360, 72, 380, 163},
Button { Button {
enabled, enabled,
"Update Key" "Update Key"
}, },
/* [8] */ /* [8] */
{360, 215, 380, 289}, {360, 217, 380, 277},
Button {
enabled,
"Just Once"
},
/* [9] */
{360, 298, 380, 357},
Button { Button {
enabled, enabled,
"Cancel" "Cancel"
},
/* [9] */
{360, 290, 380, 360},
Button {
enabled,
"Just Once"
} }
} }
}; };