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

diff --git a/src/windows/leashdll/lsh_pwd.c b/src/windows/leashdll/lsh_pwd.c
index 1a1c6e48628e4ac2a8a666f49ede546fc6375514..369c6934bd470e6e5c53a4632d6623e7bcdb0b3e 100644 (file)
--- 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 baa7a57d90edff1465382857d8ee1e3417b9dd16..704f1408676ae91a23b598ba72b3e5b0e4ce87a3 100644 (file)
--- 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