Changeset 745 for trunk/server/examples


Ignore:
Timestamp:
Nov 27, 2012, 4:43:17 PM (13 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: updated trunk to 3.6.0

Location:
trunk/server
Files:
1 deleted
17 edited
19 copied

Legend:

Unmodified
Added
Removed

  • trunk/server

  • trunk/server/examples/LDAP/samba-nds.schema

    r414 r745  
    285285attributeTypes: ( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange' DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
    286286
     287dn: cn=schema
     288changetype: modify
     289add: attributetypes
     290attributeTypes: ( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType' DESC 'Type of trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     291
     292dn: cn=schema
     293changetype: modify
     294add: attributetypes
     295attributeTypes: ( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes' DESC 'Trust attributes for a trusted domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     296
     297dn: cn=schema
     298changetype: modify
     299add: attributetypes
     300attributeTypes: ( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection' DESC 'Direction of a trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     301
     302dn: cn=schema
     303changetype: modify
     304add: attributetypes
     305attributeTypes: ( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC 'Fully qualified name of the domain with which a trust exists' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     306
     307dn: cn=schema
     308changetype: modify
     309add: attributetypes
     310attributeTypes: ( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'NetBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     311
     312dn: cn=schema
     313changetype: modify
     314add: attributetypes
     315attributeTypes: ( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing' DESC 'Authentication information for the outgoing portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     316
     317dn: cn=schema
     318changetype: modify
     319add: attributetypes
     320attributeTypes: ( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming' DESC 'Authentication information for the incoming portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     321
     322dn: cn=schema
     323changetype: modify
     324add: attributetypes
     325attributeTypes: ( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier' DESC 'SID of a trusted domain' EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
     326
     327dn: cn=schema
     328changetype: modify
     329add: attributetypes
     330attributeTypes: ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' DESC 'Forest trust information for a trusted domain object' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
    287331
    288332#######################################################################
    … …  
    360404add: objectClasses
    361405objectClasses: ( 1.3.6.1.4.1.7165.2.2.13 NAME 'sambaPrivilege' DESC 'Samba Privilege' SUP top AUXILIARY MUST ( sambaSID ) MAY ( sambaPrivilegeList ))
     406
     407dn: cn=schema
     408changetype: modify
     409add: objectClasses
     410objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) )

  • trunk/server/examples/LDAP/samba-schema-FDS.ldif

    r414 r745  
    120120#
    121121attributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME 'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
     122#
     123attributeTypes: ( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType' DESC 'Type of trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     124#
     125attributeTypes: ( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes' DESC 'Trust attributes for a trusted domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     126#
     127attributeTypes: ( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection' DESC 'Direction of a trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     128#
     129attributeTypes: ( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC 'Fully qualified name of the domain with which a trust exists' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     130#
     131attributeTypes: ( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'NetBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     132#
     133attributeTypes: ( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing' DESC 'Authentication information for the outgoing portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     134#
     135attributeTypes: ( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming' DESC 'Authentication information for the incoming portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     136#
     137attributeTypes: ( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier' DESC 'SID of a trusted domain' EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
     138#
     139attributeTypes: ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' DESC 'Forest trust information for a trusted domain object' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
    122140##
    123141#######################################################################
    … …  
    163181##
    164182objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY ( sambaPreviousClearTextPassword ) )
     183##
     184## used for IPA_ldapsam
     185##
     186objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) )

  • trunk/server/examples/LDAP/samba-schema-netscapeds5.x

    r414 r745  
    3737objectClasses: ( 1.3.6.1.4.1.7165.2.2.9 NAME 'sambaSidEntry' SUP top STRUCTURAL DESC 'Structural Class for a SID' MUST ( sambaSID )  X-ORIGIN 'user defined' )
    3838objectClasses: ( 1.3.6.1.4.1.7165.2.2.15 NAME 'sambaTrustedDomainPassword' SUP top STRUCTURAL DESC 'Samba Trusted Domain Password' MUST ( sambaDomainName $ sambaSID $ sambaClearTextPassword $ sambaPwdLastSet ) MAY  ( sambaPreviousClearTextPassword ) X-ORIGIN 'user defined')
     39objectClasses: ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) X-ORIGIN 'user defined' )
    3940attributeTypes: ( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC 'LanManager Password' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
    4041attributeTypes: ( 1.3.6.1.4.1.7165.2.1.25 NAME 'sambaNTPassword' DESC 'MD4 hash of the unicode password' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE X-ORIGIN 'user defined' )
    … …  
    6667attributeTypes: ( 1.3.6.1.4.1.7165.2.1.68 NAME 'sambaClearTextPassword' DESC 'Clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
    6768attributeTypes: ( 1.3.6.1.4.1.7165.2.1.69 NAME 'sambaPreviousClearTextPassword' DESC 'Previous clear text password (used for trusted domain passwords)' EQUALITY octetStringMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 X-ORIGIN 'user defined')
     69attributeTypes: ( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType' DESC 'Type of trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
     70attributeTypes: ( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes' DESC 'Trust attributes for a trusted domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
     71attributeTypes: ( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection' DESC 'Direction of a trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE X-ORIGIN 'user defined' )
     72attributeTypes: ( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC 'Fully qualified name of the domain with which a trust exists' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} X-ORIGIN 'user defined' )
     73attributeTypes: ( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'NetBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} X-ORIGIN 'user defined' )
     74attributeTypes: ( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing' DESC 'Authentication information for the outgoing portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} X-ORIGIN 'user defined' )
     75attributeTypes: ( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming' DESC 'Authentication information for the incoming portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} X-ORIGIN 'user defined' )
     76attributeTypes: ( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier' DESC 'SID of a trusted domain' EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE X-ORIGIN 'user defined' )
     77attributeTypes: ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' DESC 'Forest trust information for a trusted domain object' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )

  • trunk/server/examples/LDAP/samba.schema

    r414 r745  
    470470        SYNTAX 1.3.6.1.4.1.1466.115.121.1.40 )
    471471
     472attributetype ( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType'
     473        DESC 'Type of trust'
     474        EQUALITY integerMatch
     475        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     476
     477attributetype ( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes'
     478        DESC 'Trust attributes for a trusted domain'
     479        EQUALITY integerMatch
     480        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     481
     482attributetype ( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection'
     483        DESC 'Direction of a trust'
     484        EQUALITY integerMatch
     485        SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     486
     487attributetype ( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner'
     488        DESC 'Fully qualified name of the domain with which a trust exists'
     489        EQUALITY caseIgnoreMatch
     490        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     491
     492attributetype ( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName'
     493        DESC 'NetBIOS name of a domain'
     494        EQUALITY caseIgnoreMatch
     495        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     496
     497attributetype ( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing'
     498        DESC 'Authentication information for the outgoing portion of a trust'
     499        EQUALITY caseExactMatch
     500        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     501
     502attributetype ( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming'
     503        DESC 'Authentication information for the incoming portion of a trust'
     504        EQUALITY caseExactMatch
     505        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     506
     507attributetype ( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier'
     508        DESC 'SID of a trusted domain'
     509        EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch
     510        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
     511
     512attributetype ( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo'
     513        DESC 'Forest trust information for a trusted domain object'
     514        EQUALITY caseExactMatch
     515        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
    472516
    473517
    … …  
    574618##      MUST ( sambaSID )
    575619##      MAY ( sambaPrivilegeList ) )
     620
     621##
     622## used for IPA_ldapsam
     623##
     624objectclass ( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL
     625        DESC 'Samba Trusted Domain Object'
     626        MUST ( cn )
     627        MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $
     628              sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $
     629              sambaTrustAuthIncoming $ sambaSecurityIdentifier $
     630              sambaTrustForestTrustInfo) )

  • trunk/server/examples/LDAP/samba.schema.at.IBM-DS

    r414 r745  
    1 ## Samba 3.0 schema for IBM Directory Server 5.1 - object classes only
     1## Samba 3.0 schema for IBM Directory Server 5.1 - attribute Types only
    22                                                                               
    33attributetypes=( 1.3.6.1.4.1.7165.2.1.24 NAME 'sambaLMPassword' DESC 'LanManager Password' EQUALITY caseIgnoreIA5Match  SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} SINGLE-VALUE )
    … …  
    5151attributetypes=( 1.3.6.1.4.1.7165.2.1.42 NAME 'sambaOptionName' DESC 'Option Name' EQUALITY caseIgnoreMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256} )
    5252
    53 attributetypes=( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption' DESC 'A boolean option' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
     53attributetypes=( 1.3.6.1.4.1.7165.2.1.43 NAME 'sambaBoolOption' DESC 'A boolean option' EQUALITY booleanMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE )
    5454
    5555attributetypes=( 1.3.6.1.4.1.7165.2.1.44 NAME 'sambaIntegerOption' DESC 'An integer option' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
    … …  
    6969attributetypes=( 1.3.6.1.4.1.7165.2.1.53 NAME 'sambaTrustFlags' DESC 'Trust Password Flags' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 )
    7070
    71 attributetypes=( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC 'Concatenated MD4 hashes of the unicode passwords used on this account' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32} )
     71attributetypes=( 1.3.6.1.4.1.7165.2.1.54 NAME 'sambaPasswordHistory' DESC 'Concatenated MD4 hashes of the unicode passwords used on this account' EQUALITY caseIgnoreIA5Match SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} )
    7272IBMAttributetypes=( 1.3.6.1.4.1.7165.2.1.54 DBNAME( 'sambaPasswordHistory'  'sambaPasswordHistory' ) ACCESS-CLASS critical )
    7373
    … …  
    9494attributetypes=( 1.3.6.1.4.1.7165.2.1.67 NAME 'sambaRefuseMachinePwdChange' DESC 'Allow Machine Password changes (default: 0 => off)' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
    9595
     96attributetypes=( 1.3.6.1.4.1.7165.2.1.70 NAME 'sambaTrustType' DESC 'Type of trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     97
     98attributetypes=( 1.3.6.1.4.1.7165.2.1.71 NAME 'sambaTrustAttributes' DESC 'Trust attributes for a trusted domain' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     99
     100attributetypes=( 1.3.6.1.4.1.7165.2.1.72 NAME 'sambaTrustDirection' DESC 'Direction of a trust' EQUALITY integerMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE )
     101
     102attributetypes=( 1.3.6.1.4.1.7165.2.1.73 NAME 'sambaTrustPartner' DESC 'Fully qualified name of the domain with which a trust exists' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     103
     104attributetypes=( 1.3.6.1.4.1.7165.2.1.74 NAME 'sambaFlatName' DESC 'NetBIOS name of a domain' EQUALITY caseIgnoreMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{128} )
     105
     106attributetypes=( 1.3.6.1.4.1.7165.2.1.75 NAME 'sambaTrustAuthOutgoing' DESC 'Authentication information for the outgoing portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     107
     108attributetypes=( 1.3.6.1.4.1.7165.2.1.76 NAME 'sambaTrustAuthIncoming' DESC 'Authentication information for the incoming portion of a trust' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )
     109
     110attributetypes=( 1.3.6.1.4.1.7165.2.1.77 NAME 'sambaSecurityIdentifier' DESC 'SID of a trusted domain' EQUALITY caseIgnoreIA5Match SUBSTR caseExactIA5SubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{64} SINGLE-VALUE )
     111
     112attributetypes=( 1.3.6.1.4.1.7165.2.1.78 NAME 'sambaTrustForestTrustInfo' DESC 'Forest trust information for a trusted domain object' EQUALITY caseExactMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1050} )

  • trunk/server/examples/LDAP/samba.schema.oc.IBM-DS

    r414 r745  
    2020
    2121objectclasses=( 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 ))
     22
     23objectclasses=( 1.3.6.1.4.1.7165.2.2.16 NAME 'sambaTrustedDomain' SUP top STRUCTURAL DESC 'Samba Trusted Domain Object' MUST ( cn ) MAY ( sambaTrustType $ sambaTrustAttributes $ sambaTrustDirection $ sambaTrustPartner $ sambaFlatName $ sambaTrustAuthOutgoing $ sambaTrustAuthIncoming $ sambaSecurityIdentifier $ sambaTrustForestTrustInfo ) )

  • trunk/server/examples/VFS/shadow_copy_test.c

    r414 r745  
    2020
    2121#include "includes.h"
     22#include "ntioctl.h"
     23#include "smbd/proto.h"
    2224
    2325#undef DBGC_CLASS
    … …  
    5153*/
    5254
    53 static int test_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
     55static int test_get_shadow_copy_data(vfs_handle_struct *handle,
     56                                    files_struct *fsp,
     57                                    struct shadow_copy_data *shadow_copy_data,
     58                                    bool labels)
    5459{
    5560        uint32 num = 3;
    … …  
    6065        if (labels) {   
    6166                if (num) {
    62                         shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data->mem_ctx,SHADOW_COPY_LABEL,num);
     67                        shadow_copy_data->labels = TALLOC_ZERO_ARRAY(shadow_copy_data,SHADOW_COPY_LABEL,num);
    6368                } else {
    6469                        shadow_copy_data->labels = NULL;
    … …  
    8287NTSTATUS vfs_shadow_copy_test_init(void)
    8388{
    84         return smb_register_vfs(SMB_VFS_INTERFACE_VERSION, "shadow_copy_test", &vfs_test_shadow_copy_fns);
     89        return smb_register_vfs(SMB_VFS_INTERFACE_VERSION,
     90                                "shadow_copy_test",
     91                                &vfs_test_shadow_copy_fns);
    8592}

  • trunk/server/examples/VFS/skel_opaque.c

    r414 r745  
    2424
    2525#include "includes.h"
     26#include "smbd/proto.h"
    2627
    2728/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
    … …  
    6667}
    6768
    68 static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
     69static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
    6970{
    7071        errno = ENOSYS;
    … …  
    8485
    8586static SMB_STRUCT_DIR *skel_opendir(vfs_handle_struct *handle,  const char *fname, const char *mask, uint32 attr)
     87{
     88        return NULL;
     89}
     90
     91static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
    8692{
    8793        return NULL;
    … …  
    151157                                uint32_t oplock_request,
    152158                                uint64_t allocation_size,
     159                                uint32_t private_flags,
    153160                                struct security_descriptor *sd,
    154161                                struct ea_list *ea_list,
    … …  
    308315}
    309316
     317static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
     318                        enum vfs_fallocate_mode mode,
     319                        SMB_OFF_T offset, SMB_OFF_T len)
     320{
     321        errno = ENOSYS;
     322        return -1;
     323}
     324
    310325static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
    311326{
    … …  
    356371}
    357372
    358 static char *skel_realpath(vfs_handle_struct *handle,  const char *path, char *resolved_path)
     373static char *skel_realpath(vfs_handle_struct *handle,  const char *path)
    359374{
    360375        errno = ENOSYS;
    … …  
    464479
    465480static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
    466         uint32 security_info, SEC_DESC **ppdesc)
     481        uint32 security_info, struct security_descriptor **ppdesc)
    467482{
    468483        return NT_STATUS_NOT_IMPLEMENTED;
    … …  
    470485
    471486static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
    472         const char *name, uint32 security_info, SEC_DESC **ppdesc)
     487        const char *name, uint32 security_info, struct security_descriptor **ppdesc)
    473488{
    474489        return NT_STATUS_NOT_IMPLEMENTED;
    … …  
    476491
    477492static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
    478         uint32 security_info_sent, const SEC_DESC *psd)
     493        uint32 security_info_sent, const struct security_descriptor *psd)
    479494{
    480495        return NT_STATUS_NOT_IMPLEMENTED;
    … …  
    747762}
    748763
    749 static bool skel_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
     764static bool skel_is_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname, SMB_STRUCT_STAT *sbuf)
    750765{
    751766        errno = ENOSYS;
    … …  
    753768}
    754769
    755 static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
     770static int skel_set_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname)
    756771{
    757772        errno = ENOSYS;
    … …  
    776791
    777792        .opendir = skel_opendir,
     793        .fdopendir = skel_fdopendir,
    778794        .readdir = skel_readdir,
    779795        .seekdir = skel_seekdir,
    … …  
    787803        /* File operations */
    788804
    789         .open = skel_open,
     805        .open_fn = skel_open,
    790806        .create_file = skel_create_file,
    791807        .close_fn = skel_close_fn,
    … …  
    813829        .ntimes = skel_ntimes,
    814830        .ftruncate = skel_ftruncate,
     831        .fallocate = skel_fallocate,
    815832        .lock = skel_lock,
    816833        .kernel_flock = skel_kernel_flock,

  • trunk/server/examples/VFS/skel_transparent.c

    r414 r745  
    2424
    2525#include "includes.h"
     26#include "smbd/proto.h"
    2627
    2728/* PLEASE,PLEASE READ THE VFS MODULES CHAPTER OF THE
    … …  
    6566}
    6667
    67 static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, SHADOW_COPY_DATA *shadow_copy_data, bool labels)
     68static int skel_get_shadow_copy_data(vfs_handle_struct *handle, files_struct *fsp, struct shadow_copy_data *shadow_copy_data, bool labels)
    6869{
    6970        return SMB_VFS_NEXT_GET_SHADOW_COPY_DATA(handle, fsp, shadow_copy_data, labels);
    … …  
    8384{
    8485        return SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr);
     86}
     87
     88static SMB_STRUCT_DIR *skel_fdopendir(vfs_handle_struct *handle, files_struct *fsp, const char *mask, uint32 attr)
     89{
     90        return SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr);
    8591}
    8692
    … …  
    144150                                uint32_t oplock_request,
    145151                                uint64_t allocation_size,
     152                                uint32_t private_flags,
    146153                                struct security_descriptor *sd,
    147154                                struct ea_list *ea_list,
    … …  
    160167                                oplock_request,
    161168                                allocation_size,
     169                                private_flags,
    162170                                sd,
    163171                                ea_list,
    … …  
    291299}
    292300
     301static int skel_fallocate(vfs_handle_struct *handle, files_struct *fsp,
     302                        enum vfs_fallocate_mode mode,
     303                        SMB_OFF_T offset,
     304                        SMB_OFF_T len)
     305{
     306        return SMB_VFS_NEXT_FALLOCATE(handle, fsp, mode, offset, len);
     307}
     308
    293309static bool skel_lock(vfs_handle_struct *handle, files_struct *fsp, int op, SMB_OFF_T offset, SMB_OFF_T count, int type)
    294310{
    … …  
    331347}
    332348
    333 static char *skel_realpath(vfs_handle_struct *handle,  const char *path, char *resolved_path)
    334 {
    335         return SMB_VFS_NEXT_REALPATH(handle, path, resolved_path);
     349static char *skel_realpath(vfs_handle_struct *handle,  const char *path)
     350{
     351        return SMB_VFS_NEXT_REALPATH(handle, path);
    336352}
    337353
    … …  
    454470
    455471static NTSTATUS skel_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
    456         uint32 security_info, SEC_DESC **ppdesc)
     472        uint32 security_info, struct security_descriptor **ppdesc)
    457473{
    458474        return SMB_VFS_NEXT_FGET_NT_ACL(handle, fsp, security_info, ppdesc);
    … …  
    460476
    461477static NTSTATUS skel_get_nt_acl(vfs_handle_struct *handle,
    462         const char *name, uint32 security_info, SEC_DESC **ppdesc)
     478        const char *name, uint32 security_info, struct security_descriptor **ppdesc)
    463479{
    464480        return SMB_VFS_NEXT_GET_NT_ACL(handle, name, security_info, ppdesc);
    … …  
    466482
    467483static NTSTATUS skel_fset_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
    468         uint32 security_info_sent, const SEC_DESC *psd)
     484        uint32 security_info_sent, const struct security_descriptor *psd)
    469485{
    470486        return SMB_VFS_NEXT_FSET_NT_ACL(handle, fsp, security_info_sent, psd);
    … …  
    692708}
    693709
    694 static bool skel_is_offline(struct vfs_handle_struct *handle, const char *path, SMB_STRUCT_STAT *sbuf)
    695 {
    696         return SMB_VFS_NEXT_IS_OFFLINE(handle, path, sbuf);
    697 }
    698 
    699 static int skel_set_offline(struct vfs_handle_struct *handle, const char *path)
    700 {
    701         return SMB_VFS_NEXT_SET_OFFLINE(handle, path);
     710static bool skel_is_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname, SMB_STRUCT_STAT *sbuf)
     711{
     712        return SMB_VFS_NEXT_IS_OFFLINE(handle, fname, sbuf);
     713}
     714
     715static int skel_set_offline(struct vfs_handle_struct *handle, const struct smb_filename *fname)
     716{
     717        return SMB_VFS_NEXT_SET_OFFLINE(handle, fname);
    702718}
    703719
    … …  
    719735
    720736        .opendir = skel_opendir,
     737        .fdopendir = skel_fdopendir,
    721738        .readdir = skel_readdir,
    722739        .seekdir = skel_seekdir,
    … …  
    730747        /* File operations */
    731748
    732         .open = skel_open,
     749        .open_fn = skel_open,
    733750        .create_file = skel_create_file,
    734751        .close_fn = skel_close_fn,
    … …  
    756773        .ntimes = skel_ntimes,
    757774        .ftruncate = skel_ftruncate,
     775        .fallocate = skel_fallocate,
    758776        .lock = skel_lock,
    759777        .kernel_flock = skel_kernel_flock,

  • trunk/server/examples/libsmbclient/testctx.c

    r414 r745  
    11#include <libsmbclient.h>
     2#include <stdlib.h>
     3#include <stdio.h>
    24
    35void create_and_destroy_context (void)
    46{
     7  int i;
    58  SMBCCTX *ctx;
    69  ctx = smbc_new_context ();
     10  /* Both should do the same thing */
     11  smbc_setOptionDebugToStderr(ctx, 1);
     12  smbc_option_set(ctx, "debug_to_stderr", 1);
     13  smbc_setDebug(ctx, 1);
     14  i = smbc_getDebug(ctx);
     15  if (i != 1) {
     16          printf("smbc_getDebug() did not return debug level set\n");
     17          exit(1);
     18  }
     19  if (!smbc_getOptionDebugToStderr(ctx)) {
     20          printf("smbc_setOptionDebugToStderr() did not stick\n");
     21          exit(1);
     22  }
    723  smbc_init_context (ctx);
    8 
    924  smbc_free_context (ctx, 1);
    1025}

  • trunk/server/examples/libsmbclient/teststat2.c

    r414 r745  
    99 * This test is intended to ensure that the timestamps returned by
    1010 * libsmbclient are the same as timestamps returned by the local system.  To
    11  * test this, we assume a working Samba environment, and and access the same
     11 * test this, we assume a working Samba environment, and access the same
    1212 * file via SMB and locally (or NFS).
    1313 *

  • trunk/server/examples/pdb/test.c

    r414 r745  
    6868 **************************************************************************/
    6969
    70 static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, struct samu *user, const DOM_SID *sid)
     70static NTSTATUS testsam_getsampwsid (struct pdb_methods *methods, struct samu *user, const struct dom_sid *sid)
    7171{
    7272        DEBUG(10, ("testsam_getsampwsid called\n"));

  • trunk/server/examples/perfcounter/perf.h

    r414 r745  
    2121#ifndef __PERF_H__
    2222#define __PERF_H__
     23
     24#define _PUBLIC_
     25
     26#ifdef HAVE_STDBOOL_H
     27#include <stdbool.h>
     28#endif
     29
     30#if !defined(HAVE_BOOL)
     31#ifdef HAVE__Bool
     32#define bool _Bool
     33#else
     34typedef int bool;
     35#endif
     36#endif
     37
    2338
    2439#include <stdlib.h>

  • trunk/server/examples/printing/smbprint

    r414 r745  
    8282fi
    8383
    84 if [ "x$username" == "x" ] ; then
     84if [ "x$username" = "x" ] ; then
    8585        username="$server";
    8686fi
    … …  
    144144                set -x; exec >>$debugfile 2>&1
    145145                debugargs="$debugfile."
    146                 #[ "x$debugsmb" == "x" ] || debugargs="$debugargs -d $debugsmb"
     146                #[ "x$debugsmb" = "x" ] || debugargs="$debugargs -d $debugsmb"
    147147        fi
    148148fi

  • trunk/server/examples/scripts/shares/python/smbparm.py

    r414 r745  
    354354        "PANICACTION"            : ("panic action", SambaParmString, P_GLOBAL, ""),
    355355        "LDAPMACHINESUFFIX"      : ("ldap machine suffix", SambaParmString, P_GLOBAL, ""),
    356         "UPDATEENCRYPTED"        : ("update encrypted", SambaParmBool, P_GLOBAL, "No"),
    357356        "MAXTTL"                 : ("max ttl", SambaParmString, P_GLOBAL, "259200"),
    358357        "WRITABLE"               : ("read only", SambaParmBoolRev, P_LOCAL, "Yes"),

  • trunk/server/examples/scripts/users_and_groups/createdomobj.pl

    r414 r745  
    4040my $num_targets = 1;
    4141my $startnum;                           # if empty, don't add numbers to prefix
    42 my $prefix      = $target_type;         # name-prefix
     42my $prefix;                             # name-prefix
    4343my $path;                               # path to rpcclient command
    4444my $rpccli_path = $rpccli_cmd;
    … …  
    103103if (exists($options{p})) {
    104104        $prefix = $options{p};
     105} else {
     106        $prefix = $target_type;
    105107}
    106108
Note: See TracChangeset for help on using the changeset viewer.