From dbc0d9614421e064cc62aacf116ebb783c83f2f3 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Fri, 1 Apr 2016 16:50:13 +0200
Subject: [merge] merging c3sl / fr - initial commit

---
 inc/configmodule/adauth.inc.php   | 3 +--
 inc/configmodule/ldapauth.inc.php | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'inc/configmodule')

diff --git a/inc/configmodule/adauth.inc.php b/inc/configmodule/adauth.inc.php
index 9fe32f43..efc8afd7 100644
--- a/inc/configmodule/adauth.inc.php
+++ b/inc/configmodule/adauth.inc.php
@@ -14,8 +14,7 @@ class ConfigModule_AdAuth extends ConfigModule
 	const VERSION = 1;
 
 	private static $REQUIRED_FIELDS = array('server', 'searchbase', 'binddn');
-	private static $OPTIONAL_FIELDS = array('bindpw', 'home', 'ssl', 'fingerprint', 'certificate', 'homeattr',
-		'shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop', 'shareMedia', 'shareOther', 'shareHomeDrive');
+	private static $OPTIONAL_FIELDS = array('bindpw', 'home', 'ssl', 'fingerprint', 'certificate', 'homeattr');
 
 	protected function generateInternal($tgz, $parent)
 	{
diff --git a/inc/configmodule/ldapauth.inc.php b/inc/configmodule/ldapauth.inc.php
index 118e324f..67b1997a 100644
--- a/inc/configmodule/ldapauth.inc.php
+++ b/inc/configmodule/ldapauth.inc.php
@@ -14,8 +14,7 @@ class ConfigModule_LdapAuth extends ConfigModule
 	const VERSION = 1;
 
 	private static $REQUIRED_FIELDS = array('server', 'searchbase');
-	private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fingerprint', 'certificate',
-		'shareRemapMode', 'shareRemapCreate', 'shareDocuments', 'shareDownloads', 'shareDesktop', 'shareMedia', 'shareOther', 'shareHomeDrive');
+	private static $OPTIONAL_FIELDS = array('binddn', 'bindpw', 'home', 'ssl', 'fingerprint', 'certificate');
 
 	protected function generateInternal($tgz, $parent)
 	{
-- 
cgit v1.2.3-55-g7522