diff options
| author | Sam Hartman <hartmans@mit.edu> | 2011-10-14 14:42:37 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 2011-10-14 14:42:37 +0000 |
| commit | 9f097418620513813ecc086bcd9002b6e07bf2a1 (patch) | |
| tree | 93c5bae874def5949a86c76a86c810ddc1a0ae96 /src/windows/leash/KrbMiscConfigOpt.cpp | |
| parent | a0216e21ff6d3885557d145c78c8547187cbc83a (diff) | |
Further attempt at removing K4 specific code from the leash executable
Updates to leash Makefile.in to make it link on Windows 64
Signed-off-by: Alexey Melnikov <aamelnikov@gmail.com>
leash link fixes: fix mfc library and fix path to wshelper
MFC100D.lib for mscv2010; util\wshelper instead of windows\wshelper
Add ver.rc for leash
Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25339 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/leash/KrbMiscConfigOpt.cpp')
| -rw-r--r-- | src/windows/leash/KrbMiscConfigOpt.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/windows/leash/KrbMiscConfigOpt.cpp b/src/windows/leash/KrbMiscConfigOpt.cpp index cdb4c677d..2c7153ef8 100644 --- a/src/windows/leash/KrbMiscConfigOpt.cpp +++ b/src/windows/leash/KrbMiscConfigOpt.cpp @@ -282,14 +282,20 @@ BOOL CKrbMiscConfigOpt::OnInitDialog() GetDlgItem(IDC_EDIT_RENEW_MAX_M)->EnableWindow(FALSE); } - +#ifndef NO_KRB4 m_initUseKrb4 = m_newUseKrb4 = (CLeashApp::m_hKrb4DLL ? pLeash_get_default_use_krb4() : 0); - CheckDlgButton(IDC_CHECK_REQUEST_KRB4, m_initUseKrb4); + CheckDlgButton(IDC_CHECK_REQUEST_KRB4, m_initUseKrb4); if ( !CLeashApp::m_hKrb4DLL ) GetDlgItem(IDC_CHECK_REQUEST_KRB4)->EnableWindow(FALSE); +#else +////Or remove these completely? + m_initUseKrb4 = m_newUseKrb4 = 0; + CheckDlgButton(IDC_CHECK_REQUEST_KRB4, 0); + GetDlgItem(IDC_CHECK_REQUEST_KRB4)->EnableWindow(FALSE); +#endif m_initKinitPreserve = m_newKinitPreserve = pLeash_get_default_preserve_kinit_settings(); - CheckDlgButton(IDC_CHECK_PRESERVE_KINIT_OPTIONS, m_initKinitPreserve); + CheckDlgButton(IDC_CHECK_PRESERVE_KINIT_OPTIONS, m_initKinitPreserve); return(TRUE); } @@ -402,9 +408,11 @@ BOOL CKrbMiscConfigOpt::OnApply() "Leash", MB_OK); } +#ifndef NO_KRB4 if ( m_initUseKrb4 != m_newUseKrb4 ) { pLeash_set_default_use_krb4(m_newUseKrb4); } +#endif if ( m_initKinitPreserve != m_newKinitPreserve ) { pLeash_set_default_preserve_kinit_settings(m_newKinitPreserve); |