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/KrbProperties.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/KrbProperties.cpp')
| -rw-r--r-- | src/windows/leash/KrbProperties.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/windows/leash/KrbProperties.cpp b/src/windows/leash/KrbProperties.cpp index d26987e4a..0a6414253 100644 --- a/src/windows/leash/KrbProperties.cpp +++ b/src/windows/leash/KrbProperties.cpp @@ -59,19 +59,23 @@ CKrbProperties::CKrbProperties(LPCTSTR pszCaption, CWnd* pParentWnd, } #endif /* COMMENT */ +#ifndef NO_KRB4 CLeashApp::GetKrb4ConFile(m_krbPath,sizeof(m_krbPath)); CLeashApp::GetKrb4RealmFile(m_krbrealmPath,sizeof(m_krbrealmPath)); - +#endif AddPage(&m_configOptions); AddPage(&m_miscConfigOpt); +#ifndef NO_KRB4 if (CLeashApp::m_hKrb4DLL && !CLeashApp::m_hKrb5DLL) { AddPage(&m_krb4RealmHostMaintenance); AddPage(&m_krb4DomainRealmMaintenance); } - else if (CLeashApp::m_hKrb5DLL) + else +#endif + if (CLeashApp::m_hKrb5DLL) { AddPage(&m_realmHostMaintenance); AddPage(&m_domainRealmMaintenance); |