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/KrbDomainRealmMaintenance.cpp | |
| parent | a0216e21ff6d3885557d145c78c8547187cbc83a (diff) | |
| download | krb5-9f097418620513813ecc086bcd9002b6e07bf2a1.tar.gz krb5-9f097418620513813ecc086bcd9002b6e07bf2a1.tar.xz krb5-9f097418620513813ecc086bcd9002b6e07bf2a1.zip | |
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/KrbDomainRealmMaintenance.cpp')
| -rw-r--r-- | src/windows/leash/KrbDomainRealmMaintenance.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/windows/leash/KrbDomainRealmMaintenance.cpp b/src/windows/leash/KrbDomainRealmMaintenance.cpp index cb13137d8..da9e883cc 100644 --- a/src/windows/leash/KrbDomainRealmMaintenance.cpp +++ b/src/windows/leash/KrbDomainRealmMaintenance.cpp @@ -140,6 +140,7 @@ BOOL CKrbDomainRealmMaintenance::OnApply() return TRUE; } +#ifndef NO_KRB4 // Save to Kerberos Four config. file "Krb.con" CStdioFile krbrealmCon; if (!krbrealmCon.Open(CKrbProperties::m_krbrealmPath, CFile::modeCreate | @@ -165,6 +166,8 @@ BOOL CKrbDomainRealmMaintenance::OnApply() } krbrealmCon.Close(); +#endif + return TRUE; } @@ -190,6 +193,8 @@ void CKrbDomainRealmMaintenance::OnCancel() void CKrbDomainRealmMaintenance::OnButtonHostAdd() { +////I don't understand why this is doing K4 operations here +#ifndef NO_KRB4 CKrb4AddToDomainRealmList addToDomainRealmList; if (IDOK == addToDomainRealmList.DoModal()) { @@ -239,7 +244,7 @@ void CKrbDomainRealmMaintenance::OnButtonHostAdd() GetDlgItem(IDC_BUTTON_HOST_EDIT)->EnableWindow(); } } - +#endif } void CKrbDomainRealmMaintenance::OnButtonHostEdit() |