From 053e565d7e2fe5caceac37577459f459c865c2b4 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 7 Jan 2014 14:11:17 -0600
Subject: [PATCH] Don't error out on rebond unbond failure if the realm was not
 bonded to begin with

---
 src/ldapbonding.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);