From 94cbc6a811154d759e09a0b8079ab32d7696ffe5 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 15 Sep 2011 08:05:58 +0000 Subject: [PATCH] Backports from trunk -Updated contributed files git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.7@20989 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/gosa.conf | 5 +++++ gosa-core/contrib/gosa.conf.5 | 8 ++++++++ gosa-core/contrib/openldap/gosa-samba3.schema | 17 +++++++++++------ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gosa-core/contrib/gosa.conf b/gosa-core/contrib/gosa.conf index 00c0136df..e99659032 100644 --- a/gosa-core/contrib/gosa.conf +++ b/gosa-core/contrib/gosa.conf @@ -376,6 +376,11 @@ forceSSL="false" forceGlobals="true" ignoreLdapProperties="false" +{if $cv.rfc2307bis} + rfc2307bis="true" +{else} + rfc2307bis="false" +{/if} > diff --git a/gosa-core/contrib/gosa.conf.5 b/gosa-core/contrib/gosa.conf.5 index c78026873..655b7f8e5 100644 --- a/gosa-core/contrib/gosa.conf.5 +++ b/gosa-core/contrib/gosa.conf.5 @@ -373,6 +373,14 @@ characters like . or - inside of your accounts, set this to .I false. .PP +.B allowUidProposalModification +.I bool +.PP +The +.I allowUidProposalModification +statement enables the abilitiy to modify uid proposals when creating a new user from a template. +.PP + .B honourUnitTags .I bool .PP diff --git a/gosa-core/contrib/openldap/gosa-samba3.schema b/gosa-core/contrib/openldap/gosa-samba3.schema index de6d454d0..a36060354 100644 --- a/gosa-core/contrib/openldap/gosa-samba3.schema +++ b/gosa-core/contrib/openldap/gosa-samba3.schema @@ -272,6 +272,10 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.47 NAME 'gosaUserDefinedFilter' DESC 'A user defined filter' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +attributetype ( 1.3.6.1.4.1.10098.1.1.12.48 NAME 'gosaWebDAVQuota' + DESC 'Webdav share quota in KB' + SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE ) + attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle' DESC 'Field to represent the academic title' EQUALITY caseIgnoreMatch @@ -363,10 +367,11 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.12 NAME 'gosaGroupOfNames' SUP top STRUCTURAL MUST ( cn $ gosaGroupObjects ) MAY ( member $ description ) ) -objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebdavAccount' +objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.13 NAME 'gosaWebDAVAccount' DESC 'GOsa webdav enabling account (v2.7)' SUP top AUXILIARY - MUST ( cn $ uid )) + MUST ( cn $ uid ) + MAY ( gosaWebDAVQuota ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.14 NAME 'gosaIntranetAccount' DESC 'GOsa Inatrent enabling account (v2.7)' @@ -403,18 +408,18 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.20 NAME 'gosaConfig' MUST ( cn ) MAY ( gosaSetting ) ) -# GOto submenu entries +# GOto submenu entry objectclass (1.3.6.1.4.1.10098.1.2.1.43 NAME 'gotoSubmenuEntry' DESC 'GOto - contains environment settings (v2.7)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationIcon $ gosaApplicationPriority ) ) -# GOto menu entries +# GOto menu entry objectclass (1.3.6.1.4.1.10098.1.2.1.44 NAME 'gotoMenuEntry' DESC 'GOto - defines a menu entry (v2.7)' SUP top STRUCTURAL MUST ( cn ) MAY ( gosaApplicationParameter $ gosaApplicationPriority ) ) objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.21 NAME 'gosaProperties' SUP top AUXILIARY - DESC 'Class for GOsa Properties, stores for example user filters (v2.7)' - MAY ( gosaUserDefinedFilter ) ) + DESC 'Store GOsa properties (v2.7)' + MAY ( gosaUserDefinedFilter ) ) -- 2.30.2