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/KrbConfigOptions.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/KrbConfigOptions.cpp')
| -rw-r--r-- | src/windows/leash/KrbConfigOptions.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/windows/leash/KrbConfigOptions.cpp b/src/windows/leash/KrbConfigOptions.cpp index 2e1599c28..3e69bb0a1 100644 --- a/src/windows/leash/KrbConfigOptions.cpp +++ b/src/windows/leash/KrbConfigOptions.cpp @@ -82,6 +82,7 @@ static char far * near parse_str(char far*buffer,char far*result) return buffer; } +#ifndef NO_KRB4 int krb_get_krbhst(char* h, char* r, int n) { char lbstorage[BUFSIZ]; @@ -139,6 +140,7 @@ int krb_get_krbhst(char* h, char* r, int n) (void) fclose(cnffile); return(KSUCCESS); } +#endif BOOL CKrbConfigOptions::OnInitDialog() { @@ -152,6 +154,7 @@ BOOL CKrbConfigOptions::OnInitDialog() CPropertyPage::OnInitDialog(); +#ifndef NO_KRB4 if (CLeashApp::m_hKrb4DLL && !CLeashApp::m_hKrb5DLL) { // Krb4 NOT krb5 // Fill in all edit boxes @@ -200,7 +203,7 @@ BOOL CKrbConfigOptions::OnInitDialog() m_hostServer = krbhst; - // New suff to put realms in Combo Box + // New stuff to put realms in Combo Box CStdioFile krbCon; if (!krbCon.Open(CKrbProperties::m_krbPath, CFile::modeRead)) { @@ -262,7 +265,9 @@ BOOL CKrbConfigOptions::OnInitDialog() } // end of 'Check for Host' else statement } // end of 'place krbRealm in Edit box' else } - else if (CLeashApp::m_hKrb5DLL) + else +#endif + if (CLeashApp::m_hKrb5DLL) { // Krb5 OR krb5 AND krb4 char *realm = NULL; pkrb5_get_default_realm(CLeashApp::m_krbv5_context, &realm); @@ -472,6 +477,7 @@ void CKrbConfigOptions::OnSelchangeEditDefaultRealm() SetDlgItemText(IDC_EDIT_REALM_HOSTNAME, "No KDC information available"); } } +#ifndef NO_KRB4 else { CHAR krbhst[MAX_HSTNM + 1]; @@ -496,6 +502,7 @@ void CKrbConfigOptions::OnSelchangeEditDefaultRealm() if (strlen(krbhst)) SetDlgItemText(IDC_EDIT_REALM_HOSTNAME, m_hostServer); } +#endif } } |