summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2002-07-19 16:03:52 +0000
committerGerald Carter <jerry@samba.org>2002-07-19 16:03:52 +0000
commitaf3d6270d7ca17ba85e773634b3a56b0f1f601bf (patch)
tree2f0e944f4e3fa23a5627294071dea8feb11c28ff /examples
parentce16d9a26df7a3012945ecaa5738cf63110fb5c5 (diff)
downloadsamba-af3d6270d7ca17ba85e773634b3a56b0f1f601bf.tar.gz
samba-af3d6270d7ca17ba85e773634b3a56b0f1f601bf.tar.bz2
samba-af3d6270d7ca17ba85e773634b3a56b0f1f601bf.zip
merge from SAMBA_2_2 spotted by Simo
(This used to be commit 590c4ee076dcc14cb516c9ea04b47b1665c48ece)
Diffstat (limited to 'examples')
-rw-r--r--examples/LDAP/samba.schema16
1 files changed, 14 insertions, 2 deletions
diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index be088c7403..61dface0a2 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -119,8 +119,20 @@ attributetype ( 1.3.6.1.4.1.7165.2.1.15 NAME 'primaryGroupID'
# MUST ( uid $ uidNumber )
# MAY ( lmPassword $ ntPassword $ pwdLastSet $ acctFlags ))
-objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
- DESC 'Samba Account'
+#objectclass ( 1.3.6.1.4.1.7165.2.2.2 NAME 'sambaAccount' SUP top STRUCTURAL
+# DESC 'Samba Account'
+# MUST ( uid $ rid )
+# MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
+# logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $
+# displayName $ smbHome $ homeDrive $ scriptPath $ profilePath $
+# description $ userWorkstations $ primaryGroupID $ domain ))
+
+## The X.500 data model (and therefore LDAPv3) says that each entry can
+## only have one structural objectclass. OpenLDAP 2.0 does not enforce
+## this currently but will in v2.1
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.3 NAME 'sambaAccount' SUP top AUXILIARY
+ DESC 'Samba Auxilary Account'
MUST ( uid $ rid )
MAY ( cn $ lmPassword $ ntPassword $ pwdLastSet $ logonTime $
logoffTime $ kickoffTime $ pwdCanChange $ pwdMustChange $ acctFlags $