Commit b516ec89 authored by Benoit Mortier's avatar Benoit Mortier
Browse files

Fixes: #1610 even with the samba plugin installed it doesnt take the default...

Fixes: #1610 even with the samba plugin installed it doesnt take the default for samba-sid / samba-rid
parent 9a758b2d
......@@ -56,17 +56,17 @@ class sambaPluginConfig extends simplePlugin
_('Maintain sambaIdmapEntry objects. Depending on your setup this can drastically improve the windows login performance.'),
'fdSambaIdMapping'
),
//~ new StringAttribute (
//~ _('Samba SID'),
//~ _('A samba SID if not available inside of the LDAP. You can retrieve the current sid by net getlocalsid.'),
//~ 'fdSambaSID', FALSE
//~ ),
//~ new IntAttribute (
//~ _('Samba rid base'),
//~ _('The base id to add to ordinary sid calculations - if not available inside of the LDAP.'),
//~ 'fdSambaRidBase', FALSE,
//~ 0, FALSE
//~ ),
new StringAttribute (
_('Samba SID'),
_('A samba SID if not available inside of the LDAP though samba schema. You can retrieve the current sid by net getlocalsid.'),
'fdSambaSID', FALSE
),
new IntAttribute (
_('Samba rid base'),
_('The base id to add to ordinary sid calculations - if not available inside of the LDAP though samba schema.'),
'fdSambaRidBase', FALSE,
0, FALSE
),
)
),
);
......
......@@ -9,16 +9,7 @@ cn: cn=fd-samba-conf
olcAttributeTypes: ( 1.3.6.1.4.1.38414.9.1.1NAME 'fdSambaMachineAccountRDN' DESC 'FusionDirectory - Samba RDN' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.9.1.2NAME 'fdSambaHashHook' DESC 'FusionDirectory - Samba hash hook' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.9.1.3NAME 'fdSambaIdMapping' DESC 'FusionDirectory - Samba id mapping' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
#attributetype ( 1.3.6.1.4.1.38414.9.1.4 NAME 'fdSambaSID'
# DESC 'FusionDirectory - Samba SID'
# EQUALITY caseExactIA5Match
# SUBSTR caseExactIA5SubstringsMatch
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
# SINGLE-VALUE )
#attributetype ( 1.3.6.1.4.1.38414.9.1.5 NAME 'fdSambaRidBase'
# DESC 'FusionDirectory - Samba rid base'
# EQUALITY integerMatch
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
# SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.9.1.4NAME 'fdSambaSID' DESC 'FusionDirectory - Samba SID' EQUALITY caseExactIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE )
olcAttributeTypes: ( 1.3.6.1.4.1.38414.9.1.5NAME 'fdSambaRidBase' DESC 'FusionDirectory - Samba rid base' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
# Object Class
olcObjectClasses: ( 1.3.6.1.4.1.38414.9.2.1NAME 'sambaPluginConf' DESC 'FusionDirectory samba plugin configuration' SUP top AUXILIARY MUST ( ) MAY ( fdSambaMachineAccountRDN $ fdSambaHashHook $ fdSambaIdMapping ) )
olcObjectClasses: ( 1.3.6.1.4.1.38414.9.2.1NAME 'sambaPluginConf' DESC 'FusionDirectory samba plugin configuration' SUP top AUXILIARY MUST ( ) MAY ( fdSambaMachineAccountRDN $ fdSambaHashHook $ fdSambaIdMapping $ fdSambaSID $ fdSambaRidBase) )
......@@ -26,18 +26,18 @@ attributetype ( 1.3.6.1.4.1.38414.9.1.3 NAME 'fdSambaIdMapping'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE )
#attributetype ( 1.3.6.1.4.1.38414.9.1.4 NAME 'fdSambaSID'
# DESC 'FusionDirectory - Samba SID'
# EQUALITY caseExactIA5Match
# SUBSTR caseExactIA5SubstringsMatch
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
# SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.9.1.4 NAME 'fdSambaSID'
DESC 'FusionDirectory - Samba SID'
EQUALITY caseExactIA5Match
SUBSTR caseExactIA5SubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
SINGLE-VALUE )
#attributetype ( 1.3.6.1.4.1.38414.9.1.5 NAME 'fdSambaRidBase'
# DESC 'FusionDirectory - Samba rid base'
# EQUALITY integerMatch
# SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
# SINGLE-VALUE )
attributetype ( 1.3.6.1.4.1.38414.9.1.5 NAME 'fdSambaRidBase'
DESC 'FusionDirectory - Samba rid base'
EQUALITY integerMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
SINGLE-VALUE )
# Object Class
......@@ -45,4 +45,5 @@ objectclass ( 1.3.6.1.4.1.38414.9.2.1 NAME 'sambaPluginConf'
DESC 'FusionDirectory samba plugin configuration'
SUP top AUXILIARY
MUST ( )
MAY ( fdSambaMachineAccountRDN $ fdSambaHashHook $ fdSambaIdMapping ) )
MAY ( fdSambaMachineAccountRDN $ fdSambaHashHook $ fdSambaIdMapping $
fdSambaSID $ fdSambaRidBase) )
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment