mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Merge branch '4.5'
This commit is contained in:
commit
6766b6c6e4
@ -30,7 +30,6 @@ import org.apache.cloudstack.api.BaseCmd;
|
|||||||
import org.apache.cloudstack.api.Parameter;
|
import org.apache.cloudstack.api.Parameter;
|
||||||
import org.apache.cloudstack.api.ServerApiException;
|
import org.apache.cloudstack.api.ServerApiException;
|
||||||
import org.apache.cloudstack.api.response.LDAPConfigResponse;
|
import org.apache.cloudstack.api.response.LDAPConfigResponse;
|
||||||
import org.apache.cloudstack.api.response.LdapConfigurationResponse;
|
|
||||||
import org.apache.cloudstack.api.response.ListResponse;
|
import org.apache.cloudstack.api.response.ListResponse;
|
||||||
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
|
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
|
||||||
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
|
import org.apache.cloudstack.framework.config.impl.ConfigurationVO;
|
||||||
@ -227,7 +226,7 @@ public class LDAPConfigCmd extends BaseCmd {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private boolean updateLDAP() {
|
private boolean updateLDAP() {
|
||||||
LdapConfigurationResponse response = _ldapManager.addConfiguration(hostname, port);
|
_ldapManager.addConfiguration(hostname, port);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* There is no query filter now. It is derived from ldap.user.object and ldap.search.group.principle
|
* There is no query filter now. It is derived from ldap.user.object and ldap.search.group.principle
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user