From e7b3a8cad4dcd6f52d094e81595aa4aee817e898 Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Wed, 14 Aug 2013 15:47:03 -0400 Subject: Remove KRB5_DNS_LOOKUP_KDC It has been unconditionally activated by all supported build systems for almost two years, and no complaints or issues have been reported. In particular, aclocal.m4 has had an unconditional AC_DEFINE() since 3d708e55 in 2003, and win-pre.in has unconditionally set KRB5_USE_DNS_KDC since 17ffebf7 in 2011. While here, simplify some other DNS conditionals in win-pre.in where only one branch was ever taken. ticket: 7691 (new) --- src/windows/leash/KrbConfigOptions.cpp | 12 ------------ src/windows/leash/KrbRealmHostMaintenance.cpp | 4 ---- 2 files changed, 16 deletions(-) (limited to 'src/windows') diff --git a/src/windows/leash/KrbConfigOptions.cpp b/src/windows/leash/KrbConfigOptions.cpp index 3e69bb0a1..c8fa66cb6 100644 --- a/src/windows/leash/KrbConfigOptions.cpp +++ b/src/windows/leash/KrbConfigOptions.cpp @@ -309,11 +309,7 @@ BOOL CKrbConfigOptions::OnInitDialog() retval = pprofile_get_string(CLeashApp::m_krbv5_profile, "libdefaults", "dns_fallback", 0, 0, &value); if (value == 0) { -#if KRB5_DNS_LOOKUP_KDC dns_in_use = 1; -#else - dns_in_use = 0; -#endif } else { dns_in_use = config_boolean_to_int(value); pprofile_release_string(value); @@ -462,11 +458,7 @@ void CKrbConfigOptions::OnSelchangeEditDefaultRealm() retval = pprofile_get_string(CLeashApp::m_krbv5_profile, "libdefaults", "dns_fallback", 0, 0, &value); if (value == 0) { -#if KRB5_DNS_LOOKUP_KDC dns_in_use = 1; -#else - dns_in_use = 0; -#endif } else { dns_in_use = config_boolean_to_int(value); pprofile_release_string(value); @@ -541,11 +533,7 @@ void CKrbConfigOptions::ResetDefaultRealmComboBox() retval = pprofile_get_string(CLeashApp::m_krbv5_profile, "libdefaults", "dns_fallback", 0, 0, &value); if (value == 0) { -#if KRB5_DNS_LOOKUP_KDC dns = 1; -#else - dns = 0; -#endif } else { dns = config_boolean_to_int(value); pprofile_release_string(value); diff --git a/src/windows/leash/KrbRealmHostMaintenance.cpp b/src/windows/leash/KrbRealmHostMaintenance.cpp index 7b76c011e..a39af3450 100644 --- a/src/windows/leash/KrbRealmHostMaintenance.cpp +++ b/src/windows/leash/KrbRealmHostMaintenance.cpp @@ -130,11 +130,7 @@ BOOL CKrbRealmHostMaintenance::OnInitDialog() retval = pprofile_get_string(CLeashApp::m_krbv5_profile, "libdefaults", "dns_fallback", 0, 0, &value); if (value == 0) { -#if KRB5_DNS_LOOKUP_KDC m_initDnsKdcLookup = m_newDnsKdcLookup = 1; -#else - m_initDnsKdcLookup = m_newDnsKdcLookup = 0; -#endif } else { m_initDnsKdcLookup = m_newDnsKdcLookup = config_boolean_to_int(value); pprofile_release_string(value); -- cgit