summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-06-07 18:46:07 -0500
committerTimothy Pearson <[email protected]>2012-06-07 18:46:07 -0500
commit326dd6bdb8683aaf04a829c87e695547400ccf9c (patch)
tree8c0bde5c4d502261baccaa1c5c3aa1162e928c25
parent372cfda98cce196428a250ef9a60df64c0f7296e (diff)
downloadkcmldap-326dd6bdb8683aaf04a829c87e695547400ccf9c.tar.gz
kcmldap-326dd6bdb8683aaf04a829c87e695547400ccf9c.zip
Move realm load into ldap library
-rw-r--r--src/ldapbonding.cpp33
1 files changed, 1 insertions, 32 deletions
diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp
index 4d939b3..97117e8 100644
--- a/src/ldapbonding.cpp
+++ b/src/ldapbonding.cpp
@@ -158,38 +158,7 @@ void LDAPConfig::load(bool useDefaults )
// Load realms
m_realms.clear();
- TQStringList cfgRealms = systemconfig->groupList();
- for (TQStringList::Iterator it(cfgRealms.begin()); it != cfgRealms.end(); ++it) {
- if ((*it).startsWith("LDAPRealm-")) {
- systemconfig->setGroup(*it);
- TQString realmName=*it;
- realmName.remove(0,strlen("LDAPRealm-"));
- if (!m_realms.contains(realmName)) {
- // Read in realm data
- LDAPRealmConfig realmcfg;
- realmcfg.name = realmName;
- if (thisIsMyMachine) {
- realmcfg.bonded = systemconfig->readBoolEntry("bonded");
- }
- else {
- realmcfg.bonded = false;
- }
- realmcfg.uid_offset = systemconfig->readNumEntry("uid_offset");
- realmcfg.gid_offset = systemconfig->readNumEntry("gid_offset");
- realmcfg.domain_mappings = systemconfig->readListEntry("domain_mappings");
- realmcfg.kdc = systemconfig->readEntry("kdc");
- realmcfg.kdc_port = systemconfig->readNumEntry("kdc_port");
- realmcfg.admin_server = systemconfig->readEntry("admin_server");
- realmcfg.admin_server_port = systemconfig->readNumEntry("admin_server_port");
- realmcfg.pkinit_require_eku = systemconfig->readBoolEntry("pkinit_require_eku");
- realmcfg.pkinit_require_krbtgt_otherName = systemconfig->readBoolEntry("pkinit_require_krbtgt_otherName");
- realmcfg.win2k_pkinit = systemconfig->readBoolEntry("win2k_pkinit");
- realmcfg.win2k_pkinit_require_binding = systemconfig->readBoolEntry("win2k_pkinit_require_binding");
- // Add realm to list
- m_realms.insert(realmName, realmcfg);
- }
- }
- }
+ m_realms = LDAPManager::readTDERealmList(systemconfig, !thisIsMyMachine);
base->ticketLifetime->setValue(m_ticketLifetime);