summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-08-20 15:54:54 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:52:25 -0500
commit455bc1db4113ed8248cb8d7f41a30899f5aace81 (patch)
treed055c1c835fa656851b63b2f3885efc2cf9b0499
parentfeea4517e35c3c2d960945e783f1efc29250f2dd (diff)
downloadsamba-455bc1db4113ed8248cb8d7f41a30899f5aace81.tar.gz
samba-455bc1db4113ed8248cb8d7f41a30899f5aace81.tar.bz2
samba-455bc1db4113ed8248cb8d7f41a30899f5aace81.zip
r1964: more schema fixes syncing between branches
(This used to be commit 49fba32217d9a9a186a28805011bdb567ac968de)
-rw-r--r--examples/LDAP/get_next_oid8
-rw-r--r--examples/LDAP/samba.schema35
2 files changed, 39 insertions, 4 deletions
diff --git a/examples/LDAP/get_next_oid b/examples/LDAP/get_next_oid
index 54af6301f1..bf00200375 100644
--- a/examples/LDAP/get_next_oid
+++ b/examples/LDAP/get_next_oid
@@ -1,11 +1,15 @@
#!/bin/bash
-nextattrib=`cat samba.schema | grep -i attributetype.*\(.*1.3.6.1.4.1.7165. | awk '{print $3}' | cut -d. -f 10 | tail -1`
+nextattrib=`cat samba.schema | grep -i attributetype.*\(.*1.3.6.1.4.1.7165. | grep -v '^#' | \
+ awk '{print $3}' | cut -d. -f 10 | sort -n | tail -1`
+
(( nextattrib += 1 ))
echo "attributetype ( 1.3.6.1.4.1.7165.2.1.$nextattrib NAME ...."
-nextoc=`cat samba.schema | grep -i objectclass.*\(.*1.3.6.1.4.1.7165. | awk '{print $3}' | cut -d. -f 10 | tail -1`
+nextoc=`cat samba.schema | grep -i objectclass.*\(.*1.3.6.1.4.1.7165. | grep -v '^#' | \
+ awk '{print $3}' | cut -d. -f 10 | sort -n | tail -1`
+
(( nextoc += 1 ))
echo "objectclass ( 1.3.6.1.4.1.7165.2.2.$nextoc NAME ...."
diff --git a/examples/LDAP/samba.schema b/examples/LDAP/samba.schema
index 8ababa9005..17ea2d9fd2 100644
--- a/examples/LDAP/samba.schema
+++ b/examples/LDAP/samba.schema
@@ -414,6 +414,14 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.4 NAME 'sambaGroupMapping' SUP top AUXILIARY
MAY ( displayName $ description $ sambaSIDList ))
##
+## Trust password for trust relationships (any kind)
+##
+objectclass ( 1.3.6.1.4.1.7165.2.2.14 NAME 'sambaTrustPassword' SUP top STRUCTURAL
+ DESC 'Samba Trust Password'
+ MUST ( sambaDomainName $ sambaNTPassword $ sambaTrustFlags )
+ MAY ( sambaSID $ sambaPwdLastSet ))
+
+##
## Whole-of-domain info
##
objectclass ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
@@ -423,7 +431,9 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.5 NAME 'sambaDomain' SUP top STRUCTURAL
MAY ( sambaNextRid $ sambaNextGroupRid $ sambaNextUserRid $
sambaAlgorithmicRidBase ) )
+##
## used for idmap_ldap module
+##
objectclass ( 1.3.6.1.4.1.7165.2.2.7 NAME 'sambaUnixIdPool' SUP top AUXILIARY
DESC 'Pool for allocating UNIX uids/gids'
MUST ( uidNumber $ gidNumber ) )
@@ -435,6 +445,27 @@ objectclass ( 1.3.6.1.4.1.7165.2.2.8 NAME 'sambaIdmapEntry' SUP top AUXILIARY
MAY ( uidNumber $ gidNumber ) )
objectclass ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL
- DESC 'Structural Class for a SID'
- MUST ( sambaSID ) )
+ DESC 'Structural Class for a SID'
+ MUST ( sambaSID ) )
+
+objectclass ( 1.3.6.1.4.1.7165.1.2.2.10 NAME 'sambaConfig' SUP top AUXILIARY
+ DESC 'Samba Configuration Section'
+ MAY ( description ) )
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.11 NAME 'sambaShare' SUP top STRUCTURAL
+ DESC 'Samba Share Section'
+ MUST ( sambaShareName )
+ MAY ( description ) )
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.12 NAME 'sambaConfigOption' SUP top STRUCTURAL
+ DESC 'Samba Configuration Option'
+ MUST ( sambaOptionName )
+ MAY ( sambaBoolOption $ sambaIntegerOption $ sambaStringOption $
+ sambaStringListoption $ description ) )
+
+
+objectclass ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' SUP top AUXILIARY
+ DESC 'Samba Privilege'
+ MUST ( sambaSID )
+ MAY ( sambaPrivilegeList ) )