aboutsummaryrefslogtreecommitdiffstats
path: root/apps/user_ldap/js
diff options
context:
space:
mode:
authorVincent Van Houtte <vvh@aplusv.be>2022-09-05 14:39:03 +0200
committerVincent Van Houtte <vvh@aplusv.be>2022-09-09 16:53:05 +0200
commitc323022d06a2fb76745e626452ea035121f35ca9 (patch)
treed5cc951f43cd6d3b8ef815b1982cfd2a8722aeea /apps/user_ldap/js
parentf56ecf92426026c913497bea9f7ca99e8d3ac631 (diff)
downloadnextcloud-server-c323022d06a2fb76745e626452ea035121f35ca9.tar.gz
nextcloud-server-c323022d06a2fb76745e626452ea035121f35ca9.zip
Add ldap-unix-socket support - squashed commits to files Connection.php, Configuration.php, Wizard.php, LDAP.php and view.js
Signed-off-by: Vincent Van Houtte <vvh@aplusv.be>
Diffstat (limited to 'apps/user_ldap/js')
-rw-r--r--apps/user_ldap/js/wizard/view.js6
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/user_ldap/js/wizard/view.js b/apps/user_ldap/js/wizard/view.js
index 1a89eba3515..30a00d614cc 100644
--- a/apps/user_ldap/js/wizard/view.js
+++ b/apps/user_ldap/js/wizard/view.js
@@ -86,7 +86,8 @@ OCA = OCA || {};
var agent = view.configModel.configuration.ldap_dn;
var pwd = view.configModel.configuration.ldap_agent_password;
- if((host && port && base) && ((!agent && !pwd) || (agent && pwd))) {
+ if(((host && port && base) || (host && base && host.indexOf('ldapi://') > -1 ))
+ && ((!agent && !pwd) || (agent && pwd))) {
view.enableTabs();
} else {
view.disableTabs();
@@ -107,7 +108,8 @@ OCA = OCA || {};
var userFilter = this.configModel.configuration.ldap_userlist_filter;
var loginFilter = this.configModel.configuration.ldap_login_filter;
- if(host && port && base && userFilter && loginFilter) {
+ if((host && port && base && userFilter && loginFilter) ||
+ (host && base && host.indexOf('ldapi://') > -1 && userFilter && loginFilter)) {
this.configModel.requestConfigurationTest();
} else {
this._updateStatusIndicator(this.STATUS_INCOMPLETE);