You are about to delete the machine %1
This action cannot be undoneAre you sure you want to proceed?
").arg(machine.name), i18n("Confirmation Required")) == KMessageBox::Yes) {
+ m_ldapmanager->deleteMachineInfo(machine);
+ }
+
+ updateAllInformation();
+}
+
TQString readFullLineFromPtyProcess(PtyProcess* proc) {
TQString result = "";
while ((!result.contains("\n")) && (!result.contains(":")) && (!result.contains(">"))) {
diff --git a/src/ldapmgr.h b/src/ldapmgr.h
index 4ba458e..44a0583 100644
--- a/src/ldapmgr.h
+++ b/src/ldapmgr.h
@@ -55,21 +55,26 @@ class LDAPConfig: public KCModule
void connectToRealm(const TQString&);
void populateUsers();
void populateGroups();
+ void populateMachines();
void updateUsersList();
void updateGroupsList();
+ void updateMachinesList();
void userHighlighted();
void groupHighlighted();
+ void machineHighlighted();
void addNewUser();
void addNewGroup();
void modifySelectedUser();
void modifySelectedGroup();
void removeSelectedUser();
void removeSelectedGroup();
+ void removeSelectedMachine();
void updateAllInformation();
public:
LDAPUserInfo findUserInfoByName(TQString name);
LDAPGroupInfo findGroupInfoByName(TQString name);
+ LDAPMachineInfo findMachineInfoByName(TQString name);
LDAPUserInfo findUserInfoByNameAndUID(TQString name, TQString uid);
LDAPGroupInfo findGroupInfoByNameAndGID(TQString name, TQString gid);
LDAPGroupInfo findGroupInfoByGID(TQString gid);
@@ -81,6 +86,7 @@ class LDAPConfig: public KCModule
private:
LDAPUserInfo selectedUser();
LDAPGroupInfo selectedGroup();
+ LDAPMachineInfo selectedMachine();
int setPasswordForUser(LDAPUserInfo user, TQString *errstr);
private:
@@ -92,6 +98,7 @@ class LDAPConfig: public KCModule
LDAPUserInfoList m_userInfoList;
LDAPGroupInfoList m_groupInfoList;
+ LDAPMachineInfoList m_machineInfoList;
};
#endif
diff --git a/src/libtdeldap.cpp b/src/libtdeldap.cpp
index 1bb149c..af20e0e 100644
--- a/src/libtdeldap.cpp
+++ b/src/libtdeldap.cpp
@@ -140,9 +140,7 @@ printf("[RAJA DEBUG 600.0] In LDAPManager::bind()\n\r"); fflush(stdout);
LDAPMessage* msg;
TQString ldap_base_dn = m_basedc;
TQString ldap_filter = TQString("(&(objectclass=posixAccount)(uid=%1))").arg(passdlg.m_base->ldapAdminUsername->text());
- struct timeval timeout;
- timeout.tv_sec = 10; // 10 second timeout
- retcode = ldap_search_ext_s(ldapconn, ldap_base_dn.ascii(), LDAP_SCOPE_SUBTREE, ldap_filter.ascii(), NULL, 0, NULL, NULL, &timeout, 0, &msg);
+ retcode = ldap_search_ext_s(ldapconn, ldap_base_dn.ascii(), LDAP_SCOPE_SUBTREE, ldap_filter.ascii(), NULL, 0, NULL, NULL, NULL, 0, &msg);
if (retcode != LDAP_SUCCESS) {
KMessageBox::error(0, i18n("