|
@@ -68,6 +68,8 @@ class Configuration {
|
|
'ldapPort' => null,
|
|
'ldapPort' => null,
|
|
'ldapBackupHost' => null,
|
|
'ldapBackupHost' => null,
|
|
'ldapBackupPort' => null,
|
|
'ldapBackupPort' => null,
|
|
|
|
+ 'ldapBackgroundHost' => null,
|
|
|
|
+ 'ldapBackgroundPort' => null,
|
|
'ldapBase' => null,
|
|
'ldapBase' => null,
|
|
'ldapBaseUsers' => null,
|
|
'ldapBaseUsers' => null,
|
|
'ldapBaseGroups' => null,
|
|
'ldapBaseGroups' => null,
|
|
@@ -278,7 +280,7 @@ class Configuration {
|
|
$value = implode("\n", $value);
|
|
$value = implode("\n", $value);
|
|
}
|
|
}
|
|
break;
|
|
break;
|
|
- //following options are not stored but detected, skip them
|
|
|
|
|
|
+ //following options are not stored but detected, skip them
|
|
case 'ldapIgnoreNamingRules':
|
|
case 'ldapIgnoreNamingRules':
|
|
case 'ldapUuidUserAttribute':
|
|
case 'ldapUuidUserAttribute':
|
|
case 'ldapUuidGroupAttribute':
|
|
case 'ldapUuidGroupAttribute':
|
|
@@ -367,8 +369,8 @@ class Configuration {
|
|
$defaults = $this->getDefaults();
|
|
$defaults = $this->getDefaults();
|
|
}
|
|
}
|
|
return \OC::$server->getConfig()->getAppValue('user_ldap',
|
|
return \OC::$server->getConfig()->getAppValue('user_ldap',
|
|
- $this->configPrefix.$varName,
|
|
|
|
- $defaults[$varName]);
|
|
|
|
|
|
+ $this->configPrefix.$varName,
|
|
|
|
+ $defaults[$varName]);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -413,6 +415,8 @@ class Configuration {
|
|
'ldap_port' => '',
|
|
'ldap_port' => '',
|
|
'ldap_backup_host' => '',
|
|
'ldap_backup_host' => '',
|
|
'ldap_backup_port' => '',
|
|
'ldap_backup_port' => '',
|
|
|
|
+ 'ldap_background_host' => '',
|
|
|
|
+ 'ldap_background_port' => '',
|
|
'ldap_override_main_server' => '',
|
|
'ldap_override_main_server' => '',
|
|
'ldap_dn' => '',
|
|
'ldap_dn' => '',
|
|
'ldap_agent_password' => '',
|
|
'ldap_agent_password' => '',
|
|
@@ -478,6 +482,8 @@ class Configuration {
|
|
'ldap_port' => 'ldapPort',
|
|
'ldap_port' => 'ldapPort',
|
|
'ldap_backup_host' => 'ldapBackupHost',
|
|
'ldap_backup_host' => 'ldapBackupHost',
|
|
'ldap_backup_port' => 'ldapBackupPort',
|
|
'ldap_backup_port' => 'ldapBackupPort',
|
|
|
|
+ 'ldap_background_host' => 'ldapBackgroundHost',
|
|
|
|
+ 'ldap_background_port' => 'ldapBackgroundPort',
|
|
'ldap_override_main_server' => 'ldapOverrideMainServer',
|
|
'ldap_override_main_server' => 'ldapOverrideMainServer',
|
|
'ldap_dn' => 'ldapAgentName',
|
|
'ldap_dn' => 'ldapAgentName',
|
|
'ldap_agent_password' => 'ldapAgentPassword',
|
|
'ldap_agent_password' => 'ldapAgentPassword',
|