Author: jerry Date: 2004-08-20 15:54:54 +0000 (Fri, 20 Aug 2004) New Revision: 1964
WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/&rev=1964&nolog=1 Log: more schema fixes syncing between branches Modified: branches/SAMBA_3_0/examples/LDAP/get_next_oid branches/SAMBA_3_0/examples/LDAP/samba.schema Changeset: Modified: branches/SAMBA_3_0/examples/LDAP/get_next_oid =================================================================== --- branches/SAMBA_3_0/examples/LDAP/get_next_oid 2004-08-20 15:53:28 UTC (rev 1963) +++ branches/SAMBA_3_0/examples/LDAP/get_next_oid 2004-08-20 15:54:54 UTC (rev 1964) @@ -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 ...." Modified: branches/SAMBA_3_0/examples/LDAP/samba.schema =================================================================== --- branches/SAMBA_3_0/examples/LDAP/samba.schema 2004-08-20 15:53:28 UTC (rev 1963) +++ branches/SAMBA_3_0/examples/LDAP/samba.schema 2004-08-20 15:54:54 UTC (rev 1964) @@ -414,6 +414,14 @@ 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 @@ 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 @@ 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 ) ) +
