diff options
author | Simon Rettberg | 2020-12-15 13:52:36 +0100 |
---|---|---|
committer | Simon Rettberg | 2020-12-15 13:52:36 +0100 |
commit | 2218a4a1c5bb100ec920638d1f0c0ee973900c4f (patch) | |
tree | 84fd5e6a22645147da73526fa6719bdbf2f1b841 /modules-available/sysconfig/inc/configmodulebaseldap.inc.php | |
parent | [sysconfig] Minor code cleanup (diff) | |
download | slx-admin-2218a4a1c5bb100ec920638d1f0c0ee973900c4f.tar.gz slx-admin-2218a4a1c5bb100ec920638d1f0c0ee973900c4f.tar.xz slx-admin-2218a4a1c5bb100ec920638d1f0c0ee973900c4f.zip |
[sysconfig] Remove fixNumeric option; now mandatory, handled transparently
Diffstat (limited to 'modules-available/sysconfig/inc/configmodulebaseldap.inc.php')
-rw-r--r-- | modules-available/sysconfig/inc/configmodulebaseldap.inc.php | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php index 39f4f68e..6a15c7ce 100644 --- a/modules-available/sysconfig/inc/configmodulebaseldap.inc.php +++ b/modules-available/sysconfig/inc/configmodulebaseldap.inc.php @@ -6,7 +6,7 @@ abstract class ConfigModuleBaseLdap extends ConfigModule const VERSION = 3; private static $REQUIRED_FIELDS = array('server', 'searchbase'); - private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fixnumeric', 'fingerprint', 'certificate', 'homeattr', + private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fingerprint', 'certificate', 'homeattr', 'shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop', 'shareMedia', 'shareOther', 'shareHomeDrive', 'shareDomain', 'credentialPassthrough', 'mapping', 'genuid', 'ldapAttrMountOpts', 'shareHomeMountOpts', 'nohomewarn'); @@ -95,15 +95,14 @@ abstract class ConfigModuleBaseLdap extends ConfigModule if (!isset($config['shareHomeDrive'])) { $config['shareHomeDrive'] = 'H:'; } - if (!isset($config['fixnumeric'])) { - $config['fixnumeric'] = 's'; - } + // This is now always on, as we mask it transparently in our lightdm greeter + $config['fixnumeric'] = 'yes'; $config['genuid'] = isset($config['genuid']) && !empty($config['genuid']); $config['nohomewarn'] = isset($config['nohomewarn']) ? (int)$config['nohomewarn'] : 0; $this->preTaskmanagerHook($config); $task = Taskmanager::submit('CreateLdapConfig', $config); if (is_array($task) && isset($task['id'])) { - self::ldadp('restart', $this->id(), $task['id']); // TODO: Use --restart for this one only + self::ldadp('restart', $this->id(), $task['id']); } return $task; } |