diff options
| author | Kevin Wasserman <kevin.wasserman@painless-security.com> | 2012-06-27 20:14:39 -0400 |
|---|---|---|
| committer | Ben Kaduk <kaduk@mit.edu> | 2012-08-24 16:58:45 -0400 |
| commit | a61dd883285b409ead60e1657b7ff15eb6eb63bb (patch) | |
| tree | c6d2e7ba171d8ca43a7860729ecba7aa7f56dbd2 | |
| parent | b6c944374e010e6a92c530beac2003c700c5855c (diff) | |
| download | krb5-a61dd883285b409ead60e1657b7ff15eb6eb63bb.tar.gz krb5-a61dd883285b409ead60e1657b7ff15eb6eb63bb.tar.xz krb5-a61dd883285b409ead60e1657b7ff15eb6eb63bb.zip | |
Merge forwardable/proxiable in Get Tickets dialog
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
ticket: 7282 (new)
queue: kfw
target_version: 1.10.4
tags: pullup
| -rw-r--r-- | src/windows/leashdll/lsh_pwd.c | 3 | ||||
| -rw-r--r-- | src/windows/leashdll/lsh_pwd.rc | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/windows/leashdll/lsh_pwd.c b/src/windows/leashdll/lsh_pwd.c index 1a1c6e4862..369c6934bd 100644 --- a/src/windows/leashdll/lsh_pwd.c +++ b/src/windows/leashdll/lsh_pwd.c @@ -1786,7 +1786,8 @@ AuthenticateProc( lifetime = NewSliderValue(hDialog, IDC_SLIDER_LIFETIME); - forwardable = IsDlgButtonChecked(hDialog, IDC_CHECK_FORWARDABLE); + forwardable = proxiable = + IsDlgButtonChecked(hDialog, IDC_CHECK_FORWARDABLE); noaddresses = IsDlgButtonChecked(hDialog, IDC_CHECK_NOADDRESS); if (IsDlgButtonChecked(hDialog, IDC_CHECK_RENEWABLE)) { renew_till = NewSliderValue(hDialog, IDC_SLIDER_RENEWLIFE); diff --git a/src/windows/leashdll/lsh_pwd.rc b/src/windows/leashdll/lsh_pwd.rc index baa7a57d90..704f140867 100644 --- a/src/windows/leashdll/lsh_pwd.rc +++ b/src/windows/leashdll/lsh_pwd.rc @@ -106,15 +106,12 @@ BEGIN PUSHBUTTON "Clear Principal History",IDC_BUTTON_CLEAR_HISTORY,13,203,120,14 CONTROL "Ticket Lifetime",IDC_SLIDER_LIFETIME,"msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,90,97,258,15 - CONTROL "Forwardable (can be forwarded to other machines)", + CONTROL "Forwardable and Proxiable (can be forwarded to other machines)", IDC_CHECK_FORWARDABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,123,203,10 - CONTROL "Proxiable (can be forwarded to other machines)", - IDC_CHECK_FORWARDABLE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,89,135,203,10 CONTROL "Renewable (can be renewed during the renewable lifetime)", IDC_CHECK_RENEWABLE,"Button",BS_AUTOCHECKBOX | - WS_TABSTOP,89,147,203,10 + WS_TABSTOP,89,135,203,10 CONTROL "Slider2",IDC_SLIDER_RENEWLIFE,"msctls_trackbar32", TBS_BOTH | TBS_NOTICKS | WS_TABSTOP,90,178,258,15 RTEXT "Principal:",IDC_STATIC_NAME,13,44,74,8 |