diff options
author | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
---|---|---|
committer | Simon Rettberg | 2018-12-12 14:00:35 +0100 |
commit | f14c04f3af8936f07d0efaa292ce0ea92981b1f6 (patch) | |
tree | e1275d80fdced4f0b3d652277863150f756785a3 /modules-available/sysconfig/inc | |
parent | [serversetup-bwlp] Simplify permissions (diff) | |
parent | [dozmod] ldapfilters: Fix list (attr/value) (diff) | |
download | slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.gz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.tar.xz slx-admin-f14c04f3af8936f07d0efaa292ce0ea92981b1f6.zip |
Merge branch 'master' into ipxe
Diffstat (limited to 'modules-available/sysconfig/inc')
-rw-r--r-- | modules-available/sysconfig/inc/configmodulebaseldap.inc.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php index c5df8697..9364c2e3 100644 --- a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php +++ b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php @@ -8,7 +8,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule private static $REQUIRED_FIELDS = array('server', 'searchbase'); private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fixnumeric', 'fingerprint', 'certificate', 'homeattr', 'shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop', 'shareMedia', - 'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough', 'mapping', + 'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough', 'mapping', 'genuid', 'ldapAttrMountOpts', 'shareHomeMountOpts'); public static function getMapping($config = false, &$empty = true) @@ -67,6 +67,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule if (!isset($config['fixnumeric'])) { $config['fixnumeric'] = 's'; } + $config['genuid'] = isset($config['genuid']) && !empty($config['genuid']); $this->preTaskmanagerHook($config); $task = Taskmanager::submit('CreateLdapConfig', $config); if (is_array($task) && isset($task['id'])) { |