diff options
| author | Timothy Pearson <[email protected]> | 2014-01-07 14:11:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2014-01-07 14:11:17 -0600 |
| commit | 053e565d7e2fe5caceac37577459f459c865c2b4 (patch) | |
| tree | f4b5bb5e77681f0364f0cb827efaf5145c8a5dba | |
| parent | 6bdb6cd3496ec95ea993891945cd13dcbb9be2b1 (diff) | |
| download | kcmldap-053e565d7e2fe5caceac37577459f459c865c2b4.tar.gz kcmldap-053e565d7e2fe5caceac37577459f459c865c2b4.zip | |
Don't error out on rebond unbond failure if the realm was not bonded to begin with
| -rw-r--r-- | src/ldapbonding.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ldapbonding.cpp b/src/ldapbonding.cpp index d4d3fe8..85e1061 100644 --- a/src/ldapbonding.cpp +++ b/src/ldapbonding.cpp @@ -361,7 +361,7 @@ void LDAPConfig::reBondToRealm() { passdlg.m_base->ldapAdminRealm->setText(realmName); if (passdlg.exec() == TQDialog::Accepted) { setEnabled(false); - if (LDAPManager::unbondRealm(m_realms[realmName], passdlg.m_base->ldapAdminUsername->text(), passdlg.m_base->ldapAdminPassword->password(), passdlg.m_base->ldapAdminRealm->text(), &errorString) == 0) { + if ((LDAPManager::unbondRealm(m_realms[realmName], passdlg.m_base->ldapAdminUsername->text(), passdlg.m_base->ldapAdminPassword->password(), passdlg.m_base->ldapAdminRealm->text(), &errorString) == 0) || (!realmcfg.bonded)) { // Success! realmcfg.bonded = false; m_realms.remove(realmName); |