[26905] in CVS-changelog-for-Kerberos-V5
krb5 commit: Merge forwardable/proxiable in Get Tickets dialog
daemon@ATHENA.MIT.EDU (Benjamin Kaduk)
Mon Aug 27 11:52:43 2012
Date: Mon, 27 Aug 2012 11:52:14 -0400
From: Benjamin Kaduk <kaduk@mit.edu>
Message-Id: <201208271552.q7RFqEXA029284@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/a61dd883285b409ead60e1657b7ff15eb6eb63bb
commit a61dd883285b409ead60e1657b7ff15eb6eb63bb
Author: Kevin Wasserman <kevin.wasserman@painless-security.com>
Date: Wed Jun 27 20:14:39 2012 -0400
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
src/windows/leashdll/lsh_pwd.c | 3 ++-
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 1a1c6e4..369c693 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 baa7a57..704f140 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
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
