Don't error out on rebond unbond failure if the realm was not bonded to begin with

pull/1/head
Timothy Pearson 11 years ago
parent 6bdb6cd349
commit 053e565d7e

@ -361,7 +361,7 @@ void LDAPConfig::reBondToRealm() {
passdlg.m_base->ldapAdminRealm->setText(realmName); passdlg.m_base->ldapAdminRealm->setText(realmName);
if (passdlg.exec() == TQDialog::Accepted) { if (passdlg.exec() == TQDialog::Accepted) {
setEnabled(false); 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! // Success!
realmcfg.bonded = false; realmcfg.bonded = false;
m_realms.remove(realmName); m_realms.remove(realmName);

Loading…
Cancel
Save