Ignore:
Timestamp:
Nov 24, 2016, 1:14:11 PM (9 years ago)
Author:
Silvan Scherrer
Message:

Samba Server: update vendor to version 4.4.3

Location:
vendor/current/source4/setup
Files:
13 added
9 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • vendor/current/source4/setup/cn=samba.ldif

    r414 r988  
    33objectClass: container
    44cn: Samba
    5 structuralObjectClass: container
    6 entryUUID: b1d4823a-e58c-102c-9f74-51b6d59a1b68
    7 creatorsName:
    8 createTimestamp: 20080714010529Z
    9 entryCSN: 20080714010529.194412Z#000000#000#000000
    10 modifiersName:
    11 modifyTimestamp: 20080714010529Z
     5
     6dn: cn=samba-admin,cn=samba
     7objectClass: top
     8objectClass: person
     9cn: samba-admin
     10userPassword: ${LDAPADMINPASS}
     11
     12${MMR}dn: cn=replicator,cn=samba
     13${MMR}objectClass: top
     14${MMR}objectClass: person
     15${MMR}cn: replicator
     16${MMR}userPassword: ${MMR_PASSWORD}
  • vendor/current/source4/setup/dns_update_list

    r740 r988  
    11# this is a list of DNS entries which will be put into DNS using
    22# dynamic DNS update. It is processed by the samba_dnsupdate script
    3 A                                                        ${DNSDOMAIN} $IP
    4 A                                                        ${HOSTNAME} $IP
    5 CNAME ${NTDSGUID}._msdcs.${DNSDOMAIN}                    ${HOSTNAME}
    6 SRV _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN} ${HOSTNAME} 88
    7 SRV _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}     ${HOSTNAME} 389
    8 SRV _kerberos._tcp.dc._msdcs.${DNSDOMAIN}                ${HOSTNAME} 88
    9 SRV _ldap._tcp.dc._msdcs.${DNSDOMAIN}                    ${HOSTNAME} 389
    10 SRV _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSDOMAIN} ${HOSTNAME} 389
    11 SRV _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSDOMAIN}     ${HOSTNAME} 3268
    12 SRV _ldap._tcp.gc._msdcs.${DNSDOMAIN}                    ${HOSTNAME} 3268
    13 SRV _ldap._tcp.pdc._msdcs.${DNSDOMAIN}                   ${HOSTNAME} 389
    14 SRV _gc._tcp.${SITE}._sites.${DNSDOMAIN}                 ${HOSTNAME} 3268
    15 SRV _kerberos._tcp.${SITE}._sites.${DNSDOMAIN}           ${HOSTNAME} 88
    16 SRV _ldap._tcp.${SITE}._sites.${DNSDOMAIN}               ${HOSTNAME} 389
    17 SRV _gc._tcp.${DNSDOMAIN}                                ${HOSTNAME} 3268
    18 SRV _kerberos._tcp.${DNSDOMAIN}                          ${HOSTNAME} 88
    19 SRV _kpasswd._tcp.${DNSDOMAIN}                           ${HOSTNAME} 464
    20 SRV _ldap._tcp.${DNSDOMAIN}                              ${HOSTNAME} 389
    21 SRV _kerberos._udp.${DNSDOMAIN}                          ${HOSTNAME} 88
    22 SRV _kpasswd._udp.${DNSDOMAIN}                           ${HOSTNAME} 464
     3A                      ${HOSTNAME}                                           $IP
     4AAAA                   ${HOSTNAME}                                           $IP
     5
     6# RW domain controller
     7${IF_RWDC}A            ${DNSDOMAIN}                                          $IP
     8${IF_RWDC}AAAA         ${DNSDOMAIN}                                          $IP
     9${IF_RWDC}SRV          _ldap._tcp.${DNSDOMAIN}                               ${HOSTNAME} 389
     10${IF_RWDC}SRV          _ldap._tcp.dc._msdcs.${DNSDOMAIN}                     ${HOSTNAME} 389
     11${IF_RWDC}SRV          _ldap._tcp.${DOMAINGUID}.domains._msdcs.${DNSFOREST}  ${HOSTNAME} 389
     12${IF_RWDC}SRV          _kerberos._tcp.${DNSDOMAIN}                           ${HOSTNAME} 88
     13${IF_RWDC}SRV          _kerberos._udp.${DNSDOMAIN}                           ${HOSTNAME} 88
     14${IF_RWDC}SRV          _kerberos._tcp.dc._msdcs.${DNSDOMAIN}                 ${HOSTNAME} 88
     15${IF_RWDC}SRV          _kpasswd._tcp.${DNSDOMAIN}                            ${HOSTNAME} 464
     16${IF_RWDC}SRV          _kpasswd._udp.${DNSDOMAIN}                            ${HOSTNAME} 464
     17# RW and RO domain controller
     18${IF_DC}CNAME          ${NTDSGUID}._msdcs.${DNSFOREST}                       ${HOSTNAME}
     19${IF_DC}SRV            _ldap._tcp.${SITE}._sites.${DNSDOMAIN}                ${HOSTNAME} 389
     20${IF_DC}SRV            _ldap._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}      ${HOSTNAME} 389
     21${IF_DC}SRV            _kerberos._tcp.${SITE}._sites.${DNSDOMAIN}            ${HOSTNAME} 88
     22${IF_DC}SRV            _kerberos._tcp.${SITE}._sites.dc._msdcs.${DNSDOMAIN}  ${HOSTNAME} 88
     23
     24# The PDC emulator
     25${IF_PDC}SRV           _ldap._tcp.pdc._msdcs.${DNSDOMAIN}                    ${HOSTNAME} 389
     26
     27# RW GC servers
     28${IF_RWGC}A            gc._msdcs.${DNSFOREST}                                $IP
     29${IF_RWGC}AAAA         gc._msdcs.${DNSFOREST}                                $IP
     30${IF_RWGC}SRV          _gc._tcp.${DNSFOREST}                                 ${HOSTNAME} 3268
     31${IF_RWGC}SRV          _ldap._tcp.gc._msdcs.${DNSFOREST}                     ${HOSTNAME} 3268
     32# RW and RO GC servers
     33${IF_GC}SRV            _gc._tcp.${SITE}._sites.${DNSFOREST}                  ${HOSTNAME} 3268
     34${IF_GC}SRV            _ldap._tcp.${SITE}._sites.gc._msdcs.${DNSFOREST}      ${HOSTNAME} 3268
     35
     36# RW DNS servers
     37${IF_RWDNS_DOMAIN}A    DomainDnsZones.${DNSDOMAIN}                           $IP
     38${IF_RWDNS_DOMAIN}AAAA DomainDnsZones.${DNSDOMAIN}                           $IP
     39${IF_RWDNS_DOMAIN}SRV  _ldap._tcp.DomainDnsZones.${DNSDOMAIN}                ${HOSTNAME} 389
     40# RW and RO DNS servers
     41${IF_DNS_DOMAIN}SRV    _ldap._tcp.${SITE}._sites.DomainDnsZones.${DNSDOMAIN} ${HOSTNAME} 389
     42
     43# RW DNS servers
     44${IF_RWDNS_FOREST}A    ForestDnsZones.${DNSFOREST}                           $IP
     45${IF_RWDNS_FOREST}AAAA ForestDnsZones.${DNSFOREST}                           $IP
     46${IF_RWDNS_FOREST}SRV  _ldap._tcp.ForestDnsZones.${DNSFOREST}                ${HOSTNAME} 389
     47# RW and RO DNS servers
     48${IF_DNS_FOREST}SRV    _ldap._tcp.${SITE}._sites.ForestDnsZones.${DNSFOREST} ${HOSTNAME} 389
     49
  • vendor/current/source4/setup/named.conf

    r740 r988  
    3333# Note that the reverse zone file is not created during the provision process.
    3434
    35 # The most recent BIND versions (9.7.2 or later) support secure GSS-TSIG
     35# The most recent BIND versions (9.8 or later) support secure GSS-TSIG
    3636# updates.  If you are running an earlier version of BIND, or if you do not wish
    3737# to use secure GSS-TSIG updates, you may remove the update-policy sections in
  • vendor/current/source4/setup/named.txt

    r414 r988  
    11# Additional informations for DNS setup using BIND
    22
    3 # If you are running a capable version of BIND and you wish to support secure
    4 # GSS-TSIG updates, you must make the following configuration changes:
     3# If you are running a capable version of BIND and you wish to support
     4# secure GSS-TSIG updates, you must make the following configuration
     5# changes:
    56
    6 # - Insert the following lines into the options {} section of your named.conf
    7 # file:
    8 tkey-gssapi-credential "DNS/${DNSDOMAIN}";
    9 tkey-domain "${REALM}";
     7#
     8# Steps for BIND 9.8.x and 9.9.x -----------------------------------------
     9#
    1010
    11 # - Modify BIND init scripts to pass the location of the generated keytab file.
    12 # Fedora 8 & later provide a variable named KEYTAB_FILE in /etc/sysconfig/named
    13 # for this purpose:
    14 KEYTAB_FILE="${DNS_KEYTAB_ABS}"
    15 # Note that the Fedora scripts translate KEYTAB_FILE behind the scenes into a
    16 # variable named KRB5_KTNAME, which is ultimately passed to the BIND daemon.  If
    17 # your distribution does not provide a variable like KEYTAB_FILE to pass a
    18 # keytab file to the BIND daemon, a workaround is to place the following line in
    19 # BIND's sysconfig file or in the init script for BIND:
    20 export KRB5_KTNAME="${DNS_KEYTAB_ABS}"
     11# 1. Insert following lines into the options {} section of your named.conf
     12#    file:
     13tkey-gssapi-keytab "${DNS_KEYTAB_ABS}";
    2114
    22 # - Set appropriate ownership and permissions on the ${DNS_KEYTAB} file.  Note
    23 # that most distributions have BIND configured to run under a non-root user
    24 # account.  For example, Fedora 9 runs BIND as the user "named" once the daemon
    25 # relinquishes its rights.  Therefore, the file ${DNS_KEYTAB} must be readable
    26 # by the user that BIND run as.  If BIND is running as a non-root user, the
    27 # "${DNS_KEYTAB}" file must have its permissions altered to allow the daemon to
    28 # read it.  Under Fedora 9, execute the following commands:
    29 chgrp named ${DNS_KEYTAB_ABS}
    30 chmod g+r ${DNS_KEYTAB_ABS}
     15# 2. If SELinux is enabled, ensure that all files have the appropriate
     16#    SELinux file contexts.  The ${DNS_KEYTAB} file must be accessible by the
     17#    BIND daemon and should have a SELinux type of named_conf_t.  This can be
     18#    set with the following command:
     19chcon -t named_conf_t ${DNS_KEYTAB_ABS}
    3120
    32 # - Ensure the BIND zone file(s) that will be dynamically updated are in a
    33 # directory where the BIND daemon can write.  When BIND performs dynamic
    34 # updates, it not only needs to update the zone file itself but it must also
    35 # create a journal (.jnl) file to track the dynamic updates as they occur.
    36 # Under Fedora 9, the /var/named directory can not be written to by the "named"
    37 # user.  However, the directory /var/named/dynamic directory does provide write
    38 # access.  Therefore the zone files were placed under the /var/named/dynamic
    39 # directory.  The file directives in both example zone statements at the
    40 # beginning of this file were changed by prepending the directory "dynamic/".
     21#    Even if not using SELinux, do confirm (only) BIND can access this file as the
     22#    user it becomes (generally not root).
    4123
    42 # - If SELinux is enabled, ensure that all files have the appropriate SELinux
    43 # file contexts.  The ${DNS_KEYTAB} file must be accessible by the BIND daemon
    44 # and should have a SELinux type of named_conf_t.  This can be set with the
    45 # following command:
    46 chcon -t named_conf_t ${DNS_KEYTAB_ABS}
     24#
     25# Steps for BIND 9.x.x using BIND9_DLZ ------------------------------
     26#
     27
     28# 3. Disable chroot support in BIND. 
     29#    BIND is often configured to run in a chroot, but this is not
     30#    compatible with access to the dns/sam.ldb files that database
     31#    access and updates require.  Additionally, the DLZ plugin is
     32#    linked to a large number of Samba shared libraries and loads
     33#    additonal plugins.
     34
     35#
     36# Steps for BIND 9.x.x using BIND9_FLATFILE ------------------------------
     37#
     38
     39# 3. Ensure the BIND zone file(s) that will be dynamically updated are in
     40#    a directory where the BIND daemon can write.  When BIND performs
     41#    dynamic updates, it not only needs to update the zone file itself but
     42#    it must also create a journal (.jnl) file to track the dynamic updates
     43#    as they occur.  Under Fedora 9, the /var/named directory can not be
     44#    written to by the "named" user.  However, the directory /var/named/dynamic
     45#    directory does provide write access.  Therefore the zone files were
     46#    placed under the /var/named/dynamic directory.  The file directives in
     47#    both example zone statements at the beginning of this file were changed
     48#    by prepending the directory "dynamic/".
     49
  • vendor/current/source4/setup/provision.ldif

    r740 r988  
    2525systemFlags: -1946157056
    2626uASCompat: 1
     27nTSecurityDescriptor:: ${BUILTIN_DESCRIPTOR}
    2728
    2829dn: CN=Deleted Objects,${DOMAINDN}
     
    4647showInAdvancedViewOnly: FALSE
    4748gPLink: [LDAP://CN={${POLICYGUID_DC}},CN=Policies,CN=System,${DOMAINDN};0]
     49nTSecurityDescriptor:: ${DOMAIN_CONTROLLERS_DESCRIPTOR}
    4850
    4951# Joined DC located in "provision_self_join.ldif"
     
    6466systemFlags: -1946157056
    6567isCriticalSystemObject: TRUE
     68nTSecurityDescriptor:: ${INFRASTRUCTURE_DESCRIPTOR}
    6669
    6770dn: CN=LostAndFound,${DOMAINDN}
     
    7174systemFlags: -1946157056
    7275isCriticalSystemObject: TRUE
     76nTSecurityDescriptor:: ${LOSTANDFOUND_DESCRIPTOR}
    7377
    7478dn: CN=NTDS Quotas,${DOMAINDN}
     
    96100systemFlags: -1946157056
    97101isCriticalSystemObject: TRUE
     102nTSecurityDescriptor:: ${SYSTEM_DESCRIPTOR}
    98103
    99104dn: CN=AdminSDHolder,CN=System,${DOMAINDN}
  • vendor/current/source4/setup/provision_basedn_modify.ldif

    r740 r988  
    8383pwdHistoryLength: 24
    8484-
    85 replace: rIDManagerReference
    86 rIDManagerReference: CN=RID Manager$,CN=System,${DOMAINDN}
    87 -
    8885replace: serverState
    8986serverState: 1
    90 -
    91 replace: subRefs
    92 subRefs: ${CONFIGDN}
    9387-
    9488replace: systemFlags
  • vendor/current/source4/setup/provision_computers_add.ldif

    r414 r988  
    22objectClass: top
    33objectClass: container
     4nTSecurityDescriptor:: ${COMPUTERS_DESCRIPTOR}
  • vendor/current/source4/setup/provision_configuration.ldif

    r740 r988  
    2222objectClass: container
    2323systemFlags: -2147483648
     24nTSecurityDescriptor:: ${EXTENDEDRIGHTS_DESCRIPTOR}
    2425
    2526dn: CN=Change-Rid-Master,CN=Extended-Rights,${CONFIGDN}
     
    707708objectClass: top
    708709objectClass: container
     710nTSecurityDescriptor:: ${FORESTUPDATES_DESCRIPTOR}
    709711
    710712dn: CN=ActiveDirectoryRodcUpdate,CN=ForestUpdates,${CONFIGDN}
     
    10021004objectClass: lostAndFound
    10031005systemFlags: -2147483648
     1006nTSecurityDescriptor:: ${LOSTANDFOUND_DESCRIPTOR}
    10041007
    10051008dn: CN=NTDS Quotas,${CONFIGDN}
     
    10101013msDS-TombstoneQuotaFactor: 100
    10111014systemFlags: -2147483648
     1015nTSecurityDescriptor:: ${NTDSQUOTAS_DESCRIPTOR}
    10121016
    10131017# Partitions
     
    10191023msDS-Behavior-Version: ${FOREST_FUNCTIONALITY}
    10201024showInAdvancedViewOnly: TRUE
    1021 
    1022 # Partitions for DNS are missing since we don't support AD DNS
     1025nTSecurityDescriptor:: ${PARTITIONS_DESCRIPTOR}
     1026
     1027# Partitions for DNS are missing here, they are added from provision_dnszones.ldif
    10231028
    10241029dn: CN=Enterprise Configuration,CN=Partitions,${CONFIGDN}
     
    10531058objectClass: physicalLocation
    10541059l: Physical Locations tree root
     1060nTSecurityDescriptor:: ${PHYSICALLOCATIONS_DESCRIPTOR}
    10551061
    10561062# Schema located in "ad-schema/*.txt"
     
    10621068objectClass: container
    10631069systemFlags: -2147483648
     1070nTSecurityDescriptor:: ${SERVICES_DESCRIPTOR}
    10641071
    10651072dn: CN=MsmqServices,CN=Services,${CONFIGDN}
     
    11951202objectClass: sitesContainer
    11961203systemFlags: -2113929216
    1197 nTSecurityDescriptor:: ${SITES_DESCRIPTOR}
     1204ntSecurityDescriptor:: ${SITES_DESCRIPTOR}
    11981205
    11991206dn: CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
  • vendor/current/source4/setup/provision_init.ldif

    r740 r988  
    1818passwordAttribute: initialAuthOutgoing
    1919passwordAttribute: initialAuthIncoming
     20passwordAttribute: pekList
     21passwordAttribute: msDS-ExecuteScriptPassword
    2022
    2123dn: @OPTIONS
    2224checkBaseOnSearch: TRUE
     25disallowDNFilter: TRUE
    2326
    2427dn: @SAMBA_DSDB
  • vendor/current/source4/setup/provision_rootdse_modify.ldif

    r414 r988  
    44replace: isSynchronized
    55isSynchronized: TRUE
     6replace: dsServiceName
     7dsServiceName: <GUID=${NTDSGUID}>
  • vendor/current/source4/setup/provision_self_join.ldif

    r740 r988  
    2222objectSid: ${DOMAINSID}-${DCRID}
    2323
    24 # Here are missing the objects for the NTFRS subscription since we don't
    25 # support this technique yet.
    26 
    27 # Objects under "Configuration/Sites/<Default sitename>/Servers"
    28 
    29 dn: ${SERVERDN}
    30 objectClass: top
    31 objectClass: server
    32 systemFlags: 1375731712
    33 dNSHostName: ${DNSNAME}
    34 serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
    35 
    36 dn: CN=NTDS Settings,${SERVERDN}
    37 objectClass: top
    38 objectClass: applicationSettings
    39 objectClass: nTDSDSA
    40 dMDLocation: ${SCHEMADN}
    41 hasMasterNCs: ${CONFIGDN}
    42 hasMasterNCs: ${SCHEMADN}
    43 hasMasterNCs: ${DOMAINDN}
    44 invocationId: ${INVOCATIONID}
    45 msDS-Behavior-Version: ${DOMAIN_CONTROLLER_FUNCTIONALITY}
    46 msDS-HasDomainNCs: ${DOMAINDN}
    47 # "msDS-HasInstantiatedNCs"s for DNS don't exist since we don't support AD DNS
    48 msDS-HasInstantiatedNCs: B:8:0000000D:${CONFIGDN}
    49 msDS-HasInstantiatedNCs: B:8:0000000D:${SCHEMADN}
    50 msDS-HasInstantiatedNCs: B:8:00000005:${DOMAINDN}
    51 # "msDS-hasMasterNCs"s for DNS don't exist since we don't support AD DNS
    52 msDS-hasMasterNCs: ${CONFIGDN}
    53 msDS-hasMasterNCs: ${SCHEMADN}
    54 msDS-hasMasterNCs: ${DOMAINDN}
    55 options: 1
    56 systemFlags: 33554432
    57 ${NTDSGUID}
     24dn: CN=RID Set,CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
     25objectClass: rIDSet
     26rIDAllocationPool: ${RIDALLOCATIONSTART}-${RIDALLOCATIONEND}
     27rIDPreviousAllocationPool: ${RIDALLOCATIONSTART}-${RIDALLOCATIONEND}
     28rIDUsedPool: 0
     29rIDNextRID: ${RIDALLOCATIONSTART}
  • vendor/current/source4/setup/provision_self_join_modify.ldif

    r740 r988  
    33replace: fSMORoleOwner
    44fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
    5 
    6 dn: ${SCHEMADN}
    7 changetype: modify
    8 replace: fSMORoleOwner
    9 fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
     5replace: rIDManagerReference
     6rIDManagerReference: CN=RID Manager$,CN=System,${DOMAINDN}
    107
    118dn: CN=Infrastructure,${DOMAINDN}
     
    1916fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
    2017
    21 dn: CN=Partitions,${CONFIGDN}
    22 changetype: modify
    23 replace: fSMORoleOwner
    24 fSMORoleOwner: CN=NTDS Settings,${SERVERDN}
    25 
    26 dn: CN=NTDS Site Settings,CN=${DEFAULTSITE},CN=Sites,${CONFIGDN}
    27 changetype: modify
    28 replace: interSiteTopologyGenerator
    29 interSiteTopologyGenerator: CN=NTDS Settings,${SERVERDN}
    30 
    31 dn: CN=RID Set,CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
    32 changetype: add
    33 objectClass: rIDSet
    34 rIDAllocationPool: ${RIDALLOCATIONSTART}-${RIDALLOCATIONEND}
    35 rIDPreviousAllocationPool: ${RIDALLOCATIONSTART}-${RIDALLOCATIONEND}
    36 rIDUsedPool: 0
    37 rIDNextRID: ${RIDALLOCATIONSTART}
    38 
    3918dn: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
    4019changetype: modify
    4120add: rIDSetReferences
    4221rIDSetReferences: CN=RID Set,CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
     22
     23dn: ${SERVERDN}
     24changetype: modify
     25add: serverReference
     26serverReference: CN=${NETBIOSNAME},OU=Domain Controllers,${DOMAINDN}
  • vendor/current/source4/setup/provision_users.ldif

    r740 r988  
    433433isCriticalSystemObject: TRUE
    434434
    435 # Add well known security principals
    436 
    437 dn: CN=WellKnown Security Principals,${CONFIGDN}
    438 objectClass: top
    439 objectClass: container
    440 systemFlags: -2147483648
    441 
    442 dn: CN=Anonymous Logon,CN=WellKnown Security Principals,${CONFIGDN}
    443 objectClass: top
    444 objectClass: foreignSecurityPrincipal
    445 objectSid: S-1-5-7
    446 
    447 dn: CN=Authenticated Users,CN=WellKnown Security Principals,${CONFIGDN}
    448 objectClass: top
    449 objectClass: foreignSecurityPrincipal
    450 objectSid: S-1-5-11
    451 
    452 dn: CN=Batch,CN=WellKnown Security Principals,${CONFIGDN}
    453 objectClass: top
    454 objectClass: foreignSecurityPrincipal
    455 objectSid: S-1-5-3
    456 
    457 dn: CN=Creator Group,CN=WellKnown Security Principals,${CONFIGDN}
    458 objectClass: top
    459 objectClass: foreignSecurityPrincipal
    460 objectSid: S-1-3-1
    461 
    462 dn: CN=Creator Owner,CN=WellKnown Security Principals,${CONFIGDN}
    463 objectClass: top
    464 objectClass: foreignSecurityPrincipal
    465 objectSid: S-1-3-0
    466 
    467 dn: CN=Dialup,CN=WellKnown Security Principals,${CONFIGDN}
    468 objectClass: top
    469 objectClass: foreignSecurityPrincipal
    470 objectSid: S-1-5-1
    471 
    472 dn: CN=Digest Authentication,CN=WellKnown Security Principals,${CONFIGDN}
    473 objectClass: top
    474 objectClass: foreignSecurityPrincipal
    475 objectSid: S-1-5-64-21
    476 
    477 dn: CN=Enterprise Domain Controllers,CN=WellKnown Security Principals,${CONFIGDN}
    478 objectClass: top
    479 objectClass: foreignSecurityPrincipal
    480 objectSid: S-1-5-9
    481 
    482 dn: CN=Everyone,CN=WellKnown Security Principals,${CONFIGDN}
    483 objectClass: top
    484 objectClass: foreignSecurityPrincipal
    485 objectSid: S-1-1-0
    486 
    487 dn: CN=Interactive,CN=WellKnown Security Principals,${CONFIGDN}
    488 objectClass: top
    489 objectClass: foreignSecurityPrincipal
    490 objectSid: S-1-5-4
    491 
    492 dn: CN=IUSR,CN=WellKnown Security Principals,${CONFIGDN}
    493 objectClass: top
    494 objectClass: foreignSecurityPrincipal
    495 objectSid: S-1-5-17
    496 
    497 dn: CN=Local Service,CN=WellKnown Security Principals,${CONFIGDN}
    498 objectClass: top
    499 objectClass: foreignSecurityPrincipal
    500 objectSid: S-1-5-19
    501 
    502 dn: CN=Network,CN=WellKnown Security Principals,${CONFIGDN}
    503 objectClass: top
    504 objectClass: foreignSecurityPrincipal
    505 objectSid: S-1-5-2
    506 
    507 dn: CN=Network Service,CN=WellKnown Security Principals,${CONFIGDN}
    508 objectClass: top
    509 objectClass: foreignSecurityPrincipal
    510 objectSid: S-1-5-20
    511 
    512 dn: CN=NTLM Authentication,CN=WellKnown Security Principals,${CONFIGDN}
    513 objectClass: top
    514 objectClass: foreignSecurityPrincipal
    515 objectSid: S-1-5-64-10
    516 
    517 dn: CN=Other Organization,CN=WellKnown Security Principals,${CONFIGDN}
    518 objectClass: top
    519 objectClass: foreignSecurityPrincipal
    520 objectSid: S-1-5-1000
    521 
    522 dn: CN=Owner Rights,CN=WellKnown Security Principals,${CONFIGDN}
    523 objectClass: top
    524 objectClass: foreignSecurityPrincipal
    525 objectSid: S-1-3-4
    526 
    527 dn: CN=Proxy,CN=WellKnown Security Principals,${CONFIGDN}
    528 objectClass: top
    529 objectClass: foreignSecurityPrincipal
    530 objectSid: S-1-5-8
    531 
    532 dn: CN=Remote Interactive Logon,CN=WellKnown Security Principals,${CONFIGDN}
    533 objectClass: top
    534 objectClass: foreignSecurityPrincipal
    535 objectSid: S-1-5-14
    536 
    537 dn: CN=Restricted,CN=WellKnown Security Principals,${CONFIGDN}
    538 objectClass: top
    539 objectClass: foreignSecurityPrincipal
    540 objectSid: S-1-5-12
    541 
    542 dn: CN=SChannel Authentication,CN=WellKnown Security Principals,${CONFIGDN}
    543 objectClass: top
    544 objectClass: foreignSecurityPrincipal
    545 objectSid: S-1-5-64-14
    546 
    547 dn: CN=Self,CN=WellKnown Security Principals,${CONFIGDN}
    548 objectClass: top
    549 objectClass: foreignSecurityPrincipal
    550 objectSid: S-1-5-10
    551 
    552 dn: CN=Service,CN=WellKnown Security Principals,${CONFIGDN}
    553 objectClass: top
    554 objectClass: foreignSecurityPrincipal
    555 objectSid: S-1-5-6
    556 
    557 dn: CN=System,CN=WellKnown Security Principals,${CONFIGDN}
    558 objectClass: top
    559 objectClass: foreignSecurityPrincipal
    560 objectSid: S-1-5-18
    561 
    562 dn: CN=Terminal Server User,CN=WellKnown Security Principals,${CONFIGDN}
    563 objectClass: top
    564 objectClass: foreignSecurityPrincipal
    565 objectSid: S-1-5-13
    566 
    567 dn: CN=This Organization,CN=WellKnown Security Principals,${CONFIGDN}
    568 objectClass: top
    569 objectClass: foreignSecurityPrincipal
    570 objectSid: S-1-5-15
  • vendor/current/source4/setup/provision_users_add.ldif

    r414 r988  
    22objectClass: top
    33objectClass: container
     4nTSecurityDescriptor:: ${USERS_DESCRIPTOR}
  • vendor/current/source4/setup/schema_samba4.ldif

    r740 r988  
    1212## 1.3.6.1.4.1.7165.4.4.x - LDB/LDAP Extended Operations
    1313### see dsdb/samdb/samdb.h
     14
     15## 1.3.6.1.4.1.7165.4.5.x - ldap extended matches
    1416
    1517## 1.3.6.1.4.1.7165.4.255.x - mapped OIDs due to conflicts between AD and standards-track
     
    190192#Allocated: (not used anymore) DSDB_CONTROL_SEARCH_APPLY_ACCESS 1.3.6.1.4.1.7165.4.3.15
    191193#Allocated: LDB_CONTROL_PROVISION_OID 1.3.6.1.4.1.7165.4.3.16
     194#Allocated: DSDB_CONTROL_NO_GLOBAL_CATALOG 1.3.6.1.4.1.7165.4.3.17
     195#Allocated: DSDB_CONTROL_PARTIAL_REPLICA 1.3.6.1.4.1.7165.4.3.18
     196#Allocated: DSDB_CONTROL_DBCHECK 1.3.6.1.4.1.7165.4.3.19
     197#Allocated: DSDB_CONTROL_DBCHECK_MODIFY_RO_REPLICA 1.3.6.1.4.1.7165.4.3.19.1
     198#Allocated: DSDB_CONTROL_PASSWORD_BYPASS_LAST_SET_OID 1.3.6.1.4.1.7165.4.3.20
     199#Allocated: DSDB_CONTROL_SEC_DESC_PROPAGATION_OID 1.3.6.1.4.1.7165.4.3.21
     200#Allocated: DSDB_CONTROL_PERMIT_INTERDOMAIN_TRUST_UAC_OID 1.3.6.1.4.1.7165.4.3.23
     201#Allocated: DSDB_CONTROL_RESTORE_TOMBSTONE_OID 1.3.6.1.4.1.7165.4.3.24
     202#Allocated: DSDB_CONTROL_CHANGEREPLMETADATA_RESORT_OID 1.3.6.1.4.1.7165.4.3.25
    192203
    193204# Extended 1.3.6.1.4.1.7165.4.4.x
     
    197208#Allocated: DSDB_EXTENDED_CREATE_PARTITION_OID 1.3.6.1.4.1.7165.4.4.4
    198209#Allocated: DSDB_EXTENDED_ALLOCATE_RID_POOL 1.3.6.1.4.1.7165.4.4.5
     210#Allocated: DSDB_EXTENDED_SCHEMA_UPGRADE_IN_PROGRESS_OID 1.3.6.1.4.1.7165.4.4.6
     211#Allocated: DSDB_EXTENDED_SEC_DESC_PROPAGATION_OID 1.3.6.1.4.1.7165.4.4.7
     212
     213
     214############
     215# ldap extended matches
     216#Allocated: SAMBA_LDAP_MATCH_ALWAYS_FALSE 1.3.6.1.4.1.7165.4.5.1
     217
    199218
    200219#Allocated: (middleName) attributeID: 1.3.6.1.4.1.7165.4.255.1
  • vendor/current/source4/setup/secrets_dns.ldif

    r740 r988  
    55objectClass: kerberosSecret
    66realm: ${REALM}
    7 servicePrincipalName: DNS/${DNSDOMAIN}
     7saltPrincipal: dns-${HOSTNAME}@${REALM}
    88servicePrincipalName: DNS/${DNSNAME}
    9 msDS-KeyVersionNumber: 1
     9msDS-KeyVersionNumber: ${KEY_VERSION_NUMBER}
    1010privateKeytab: ${DNS_KEYTAB}
    1111secret:: ${DNSPASS_B64}
  • vendor/current/source4/setup/slapd.conf

    r740 r988  
    2929          uid=([^,]*),cn=([^,]*),cn=ntlm,cn=auth
    3030          ldap:///cn=samba??one?(cn=\$1)
     31
     32authz-regexp
     33          gidNumber=.*\\\+uidNumber=${ADMIN_UID},cn=peercred,cn=external,cn=auth
     34          cn=samba-admin,cn=samba
    3135
    3236access to dn.base=""
     
    6266moduleload syncprov
    6367
    64 database        ldif
     68database        mdb
    6569suffix          cn=Samba
    6670directory       ${LDAPDIR}/db/samba
     
    8286########################################
    8387### cn=schema ###
    84 database        hdb
     88database        mdb
    8589suffix          ${SCHEMADN}
    8690rootdn          cn=Manager,${SCHEMADN}
     
    8892${NOSYNC}
    8993${INDEX_CONFIG}
     94maxsize 1073741824
    9095
    9196#syncprov is stable in OpenLDAP 2.3, and available in 2.2. 
     
    103108#########################################
    104109### cn=config ###
    105 database        hdb
     110database        mdb
    106111suffix          ${CONFIGDN}
    107112rootdn          cn=Manager,${CONFIGDN}
     
    109114${NOSYNC}
    110115${INDEX_CONFIG}
     116maxsize 1073741824
    111117
    112118#syncprov is stable in OpenLDAP 2.3, and available in 2.2. 
     
    123129
    124130########################################
     131### domaindns
     132database        mdb
     133suffix          dc=domaindnszones,${DOMAINDN}
     134rootdn          cn=Manager,${DOMAINDN}
     135directory       ${LDAPDIR}/db/domaindns
     136${NOSYNC}
     137${INDEX_CONFIG}
     138maxsize 1073741824
     139
     140#syncprov is stable in OpenLDAP 2.3, and available in 2.2.
     141#We need this for the contextCSN attribute and mmr.
     142overlay syncprov
     143syncprov-sessionlog 100
     144syncprov-checkpoint 100 10
     145
     146overlay rdnval
     147
     148### Multimaster-Replication of domainDNS context ###
     149${MMR_SYNCREPL_DOMAINDNS_CONFIG}
     150${MIRRORMODE}
     151
     152########################################
     153### forestdns  ###
     154database        mdb
     155suffix          dc=forestdnszones,${DOMAINDN}
     156rootdn          cn=Manager,${DOMAINDN}
     157directory       ${LDAPDIR}/db/forestdns
     158${NOSYNC}
     159${INDEX_CONFIG}
     160maxsize 1073741824
     161
     162#syncprov is stable in OpenLDAP 2.3, and available in 2.2.
     163#We need this for the contextCSN attribute and mmr.
     164overlay syncprov
     165syncprov-sessionlog 100
     166syncprov-checkpoint 100 10
     167
     168overlay rdnval
     169
     170### Multimaster-Replication of forestDNS context ###
     171${MMR_SYNCREPL_FORESTDNS_CONFIG}
     172${MIRRORMODE}
     173
     174########################################
    125175### cn=users /base-dn  ###
    126 database        hdb
     176database        mdb
    127177suffix          ${DOMAINDN}
    128178rootdn          cn=Manager,${DOMAINDN}
     
    130180${NOSYNC}
    131181${INDEX_CONFIG}
     182maxsize 1073741824
    132183
    133184#syncprov is stable in OpenLDAP 2.3, and available in 2.2. 
  • vendor/current/source4/setup/spn_update_list

    r740 r988  
    66HOST/${HOSTNAME}/${WORKGROUP}
    77ldap/${HOSTNAME}/${WORKGROUP}
    8 GC/${HOSTNAME}/${DNSDOMAIN}
     8GC/${HOSTNAME}/${DNSFOREST}
    99ldap/${HOSTNAME}
    1010HOST/${HOSTNAME}/${DNSDOMAIN}
     
    1212HOST/${NETBIOSNAME}
    1313E3514235-4B06-11D1-AB04-00C04FC2DCD2/${NTDSGUID}/${DNSDOMAIN}
    14 ldap/${NTDSGUID}._msdcs.${DNSDOMAIN}
     14ldap/${NTDSGUID}._msdcs.${DNSFOREST}
    1515ldap/${NETBIOSNAME}
    1616RestrictedKrbHost/${NETBIOSNAME}
    1717RestrictedKrbHost/${HOSTNAME}
     18ldap/${HOSTNAME}/DomainDnsZones.${DNSDOMAIN}
     19ldap/${HOSTNAME}/ForestDnsZones.${DNSDOMAIN}
    1820
    1921# These are not supported yet:
    2022# NtFrs-88f5d2bd-b646-11d2-a6d3-00c04fc9b232/${HOSTNAME}
    2123# Dfsr-12F9A27C-BF97-4787-9364-D31B6C55EB04/${HOSTNAME}
    22 # ldap/${HOSTNAME}/DomainDnsZones.${DNSDOMAIN}
    23 # ldap/${HOSTNAME}/ForestDnsZones.${DNSDOMAIN}
    2424#
    25 # Only used in DNS mode:
     25# Only used in DNS mode: (This is added on dns-${HOSTNAME} account, should not be added here)
    2626# DNS/${HOSTNAME}
    2727#
  • vendor/current/source4/setup/tests/blackbox_group.sh

    r740 r988  
    1515
    1616rm -rf $PREFIX/simple-dc
    17 testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
     17testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
    1818samba_tool="./bin/samba-tool"
    1919
     
    2121
    2222#creation of two test subjects
    23 testit "newuser" $samba_tool newuser $CONFIG --given-name="User" --surname="Tester" --initial="UT" testuser testp@ssw0Rd
    24 testit "newuser" $samba_tool newuser $CONFIG --given-name="User1" --surname="Tester" --initial="UT" testuser1 testp@ssw0Rd
     23testit "user add" $samba_tool user create $CONFIG --given-name="User" --surname="Tester" --initial="UT" testuser testp@ssw0Rd
     24testit "user add" $samba_tool user create $CONFIG --given-name="User1" --surname="Tester" --initial="UT" testuser1 testp@ssw0Rd
    2525
    2626#test creation of six different groups
     
    3333
    3434#test adding test users to all groups by their username
    35 testit "group addmembers" $samba_tool group addmembers $CONFIG dsg newuser,newuser1
    36 testit "group addmembers" $samba_tool group addmembers $CONFIG gsg newuser,newuser1
    37 testit "group addmembers" $samba_tool group addmembers $CONFIG usg newuser,newuser1
    38 testit "group addmembers" $samba_tool group addmembers $CONFIG ddg newuser,newuser1
    39 testit "group addmembers" $samba_tool group addmembers $CONFIG gdg newuser,newuser1
    40 testit "group addmembers" $samba_tool group addmembers $CONFIG udg newuser,newuser1
     35testit "group addmembers" $samba_tool group addmembers $CONFIG dsg testuser,testuser1
     36testit "group addmembers" $samba_tool group addmembers $CONFIG gsg testuser,testuser1
     37testit "group addmembers" $samba_tool group addmembers $CONFIG usg testuser,testuser1
     38testit "group addmembers" $samba_tool group addmembers $CONFIG ddg testuser,testuser1
     39testit "group addmembers" $samba_tool group addmembers $CONFIG gdg testuser,testuser1
     40testit "group addmembers" $samba_tool group addmembers $CONFIG udg testuser,testuser1
    4141
    4242#test removing test users from all groups by their username
    43 testit "group removemembers" $samba_tool group removemembers $CONFIG dsg newuser,newuser1
    44 testit "group removemembers" $samba_tool group removemembers $CONFIG gsg newuser,newuser1
    45 testit "group removemembers" $samba_tool group removemembers $CONFIG usg newuser,newuser1
    46 testit "group removemembers" $samba_tool group removemembers $CONFIG ddg newuser,newuser1
    47 testit "group removemembers" $samba_tool group removemembers $CONFIG gdg newuser,newuser1
    48 testit "group removemembers" $samba_tool group removemembers $CONFIG udg newuser,newuser1
     43testit "group removemembers" $samba_tool group removemembers $CONFIG dsg testuser,testuser1
     44testit "group removemembers" $samba_tool group removemembers $CONFIG gsg testuser,testuser1
     45testit "group removemembers" $samba_tool group removemembers $CONFIG usg testuser,testuser1
     46testit "group removemembers" $samba_tool group removemembers $CONFIG ddg testuser,testuser1
     47testit "group removemembers" $samba_tool group removemembers $CONFIG gdg testuser,testuser1
     48testit "group removemembers" $samba_tool group removemembers $CONFIG udg testuser,testuser1
    4949
    5050#test adding test users to all groups by their cn
     
    7272testit "group delete" $samba_tool group delete $CONFIG udg
    7373
     74#test listing of all groups
     75testit "group list" $samba_tool group list $CONFIG
     76
     77#test listing of members of a particular group
     78testit "group listmembers" $samba_tool group listmembers $CONFIG Users
     79
    7480exit $failed
  • vendor/current/source4/setup/tests/blackbox_newuser.sh

    r740 r988  
    1515
    1616rm -rf $PREFIX/simple-dc
    17 testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
     17testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
    1818samba_tool="./bin/samba-tool"
    1919
     
    2323#newuser  account is created with cn=Given Name Initials. Surname
    2424#newuser1 account is created using cn=username
    25 testit "newuser" $samba_tool newuser $CONFIG --given-name="User" --surname="Tester" --initials="T" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser testp@ssw0Rd
    26 testit "newuser" $samba_tool newuser $CONFIG --use-username-as-cn --given-name="User1" --surname="Tester1" --initials="UT1" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser1 testp@ssw0Rd
     25testit "user add" $samba_tool user create $CONFIG --given-name="User" --surname="Tester" --initials="T" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser testp@ssw0Rd
     26testit "user add" $samba_tool user create $CONFIG --use-username-as-cn --given-name="User1" --surname="Tester1" --initials="UT1" --profile-path="\\\\myserver\\my\\profile" --script-path="\\\\myserver\\my\\script" --home-directory="\\\\myserver\\my\\homedir" --job-title="Tester" --department="Testing" --company="Samba.org" --description="Description" --mail-address="tester@samba.org" --internet-address="http://samba.org" --telephone-number="001122334455" --physical-delivery-office="101" --home-drive="H:" NewUser1 testp@ssw0Rd
    2727
    2828# check the enable account script
    29 testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser
    30 testit "enableaccount" $samba_tool enableaccount $CONFIG NewUser1
     29testit "enableaccount" $samba_tool user enable $CONFIG NewUser
     30testit "enableaccount" $samba_tool user enable $CONFIG NewUser1
    3131
    3232# check the enable account script
    33 testit "setpassword" $samba_tool setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2
    34 testit "setpassword" $samba_tool setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2
     33testit "setpassword" $samba_tool user setpassword $CONFIG NewUser --newpassword=testp@ssw0Rd2
     34testit "setpassword" $samba_tool user setpassword $CONFIG NewUser1 --newpassword=testp@ssw0Rd2
    3535
    3636# check the setexpiry script
    37 testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser --noexpiry
    38 testit "noexpiry" $samba_tool setexpiry $CONFIG NewUser1 --noexpiry
    39 testit "expiry" $samba_tool setexpiry $CONFIG NewUser --days=7
    40 testit "expiry" $samba_tool setexpiry $CONFIG NewUser1 --days=7
     37testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser --noexpiry
     38testit "noexpiry" $samba_tool user setexpiry $CONFIG NewUser1 --noexpiry
     39testit "expiry" $samba_tool user setexpiry $CONFIG NewUser --days=7
     40testit "expiry" $samba_tool user setexpiry $CONFIG NewUser1 --days=7
    4141
    4242exit $failed
  • vendor/current/source4/setup/tests/blackbox_provision-backend.sh

    r740 r988  
    99
    1010PREFIX="$1"
     11export TEST_LDAP="yes"
    1112shift 1
    12 
    1313. `dirname $0`/../../../testprogs/blackbox/subunit.sh
    1414
    15 testit "openldap-backend" $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --ldap-dryrun-mode --slapd-path=/dev/null
    16 testit "openldap-mmr-backend" $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --ldap-dryrun-mode --slapd-path=/dev/null --username=samba-admin --password=linux --adminpass=linux --ldapadminpass=linux
    17 testit "fedora-ds-backend" $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --ldap-dryrun-mode --slapd-path=/dev/null
     15testit "openldap-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode
     16testit "openldap-mmr-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-mmr-backend --ol-mmr-urls="ldap://s4dc1.test:9000,ldap://s4dc2.test:9000" --adminpass=linux --ldapadminpass=linux --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode
     17testit "fedora-ds-backend" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend --slapd-path=/dev/null --use-ntvfs --ldap-dryrun-mode
    1818
    1919reprovision() {
    20         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision --ldap-dryrun-mode --slapd-path=/dev/null
    21         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision --ldap-dryrun-mode --slapd-path=/dev/null
     20        $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision --use-ntvfs --ldap-dryrun-mode --slapd-path=/dev/null
     21       $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --ldap-backend-type=openldap --targetdir=$PREFIX/openldap-backend-reprovision --use-ntvfs --ldap-dryrun-mode --slapd-path=/dev/null
    2222}
    2323
  • vendor/current/source4/setup/tests/blackbox_provision.sh

    r740 r988  
    1717mkdir -p $PREFIX/simple-default/etc
    1818touch $PREFIX/simple-default/etc/smb.conf
    19 testit "simple-default" $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default
     19testit "simple-default" $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default --use-ntvfs
    2020#And try with just whitespace
    2121rm -rf $PREFIX/simple-dc
    2222mkdir -p $PREFIX/simple-dc/etc
    2323echo "  " > $PREFIX/simple-dc/etc/smb.conf
    24 testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
     24testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
    2525#The rest of these tests are with no smb.conf file present
    2626
    2727rm -rf $PREFIX/simple-dc
    28 testit "simple-dc-guids" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --domain-guid=6054d36d-2bfd-44f1-a9cd-32cfbb06480b --ntds-guid=b838f255-c8aa-4fe8-9402-b7d61ca3bd1b --invocationid=6d4cff9a-2bbf-4b4c-98a2-36242ddb0bd6 --targetdir=$PREFIX/simple-dc
     28testit "simple-dc-guids" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --domain-guid=6054d36d-2bfd-44f1-a9cd-32cfbb06480b --ntds-guid=b838f255-c8aa-4fe8-9402-b7d61ca3bd1b --invocationid=6d4cff9a-2bbf-4b4c-98a2-36242ddb0bd6 --targetdir=$PREFIX/simple-dc --use-ntvfs
    2929rm -rf $PREFIX/simple-member
    30 testit "simple-member" $PYTHON $SRCDIR/source4/setup/provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member
     30testit "simple-member" $PYTHON $BINDIR/samba-tool domain provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member --use-ntvfs
    3131rm -rf $PREFIX/simple-standalone
    32 testit "simple-standalone" $PYTHON $SRCDIR/source4/setup/provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone
     32testit "simple-standalone" $PYTHON $BINDIR/samba-tool domain provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone --use-ntvfs
    3333rm -rf $PREFIX/blank-dc
    34 testit "blank-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank
    35 rm -rf $PREFIX/partitions-only-dc
    36 testit "partitions-only-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only
     34testit "blank-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank --use-ntvfs
    3735
    3836reprovision() {
    39         rm -rf $PREFIX/reprovision
    40         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
    41         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
     37        $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/simple-default" --use-ntvfs
    4238}
    4339
     
    4945rm -rf $PREFIX/simple-standalone
    5046rm -rf $PREFIX/partitions-only-dc
    51 rm -rf $PREFIX/reprovision
    5247
    5348exit $failed
  • vendor/current/source4/setup/tests/blackbox_setpassword.sh

    r740 r988  
    1616
    1717rm -rf $PREFIX/simple-dc
    18 testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
     18mkdir -p $PREFIX/simple-dc
    1919
    20 testit "newuser" $samba_tool newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd
     20testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs
    2121
    22 testit "setpassword" $samba_tool setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd
     22testit "user add" $samba_tool user create --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd
    2323
    24 testit "setpassword" $samba_tool setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd --must-change-at-next-login
     24testit "setpassword" $samba_tool user setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd
    2525
    26 testit "pwsettings" $samba_tool pwsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default --store-plaintext=on
     26testit "setpassword" $samba_tool user setpassword --configfile=$PREFIX/simple-dc/etc/smb.conf testuser --newpassword=testp@ssw0Rd --must-change-at-next-login
     27
     28testit "passwordsettings" $samba_tool domain passwordsettings --quiet set --configfile=$PREFIX/simple-dc/etc/smb.conf --complexity=default --history-length=default --min-pwd-length=default --min-pwd-age=default --max-pwd-age=default --store-plaintext=on
    2729
    2830exit $failed
  • vendor/current/source4/setup/tests/blackbox_upgradeprovision.sh

    r740 r988  
    1313. `dirname $0`/../../../testprogs/blackbox/subunit.sh
    1414
     15[ ! -d $PREFIX ] && mkdir $PREFIX
     16
     17upgradeprovision_reference() {
     18  if [ -d $PREFIX/upgradeprovision_reference ]; then
     19    rm -fr $PREFIX/upgradeprovision_reference
     20  fi
     21        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_reference" --server-role="dc" --use-ntvfs
     22}
     23
    1524upgradeprovision() {
    1625  if [ -d $PREFIX/upgradeprovision ]; then
    1726    rm -fr $PREFIX/upgradeprovision
    1827  fi
    19         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc"
    20         $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
     28        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs
     29        $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange
    2130}
    2231
     
    2534    rm -fr $PREFIX/upgradeprovision_full
    2635  fi
    27         $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc"
    28         $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
     36        $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs
     37        $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange
     38}
     39
     40# The ldapcmp runs here are to ensure that a 'null' run of
     41# upgradeprovision (because we did a provision with the same template)
     42# really doesn't change anything.
     43
     44ldapcmp() {
     45        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn
     46}
     47
     48ldapcmp_full() {
     49        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --skip-missing-dn
     50}
     51
     52ldapcmp_sd() {
     53        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn
     54}
     55
     56ldapcmp_full_sd() {
     57        $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX/upgradeprovision_full/private/sam.ldb tdb://$PREFIX/upgradeprovision_reference/private/sam.ldb --two --sd --skip-missing-dn
    2958}
    3059
    3160testit "upgradeprovision" upgradeprovision
    3261testit "upgradeprovision_full" upgradeprovision_full
     62testit "upgradeprovision_reference" upgradeprovision_reference
     63testit "ldapcmp" ldapcmp
     64testit "ldapcmp_full" ldapcmp_full
     65testit "ldapcmp_sd" ldapcmp_sd
     66testit "ldapcmp_full_sd" ldapcmp_full_sd
    3367
    3468if [ -d $PREFIX/upgradeprovision ]; then
     
    4074fi
    4175
     76if [ -d $PREFIX/upgradeprovision_reference ]; then
     77  rm -fr $PREFIX/upgradeprovision_reference
     78fi
     79
    4280exit $failed
  • vendor/current/source4/setup/wscript_build

    r740 r988  
    11#!/usr/bin/env python
    2 
    3 from samba_utils import MODE_755
    42
    53bld.INSTALL_WILDCARD('${SETUPDIR}', 'ad-schema/*.txt')
    64bld.INSTALL_WILDCARD('${SETUPDIR}', 'display-specifiers/*.txt')
    7 
    8 bld.INSTALL_FILES('${SBINDIR}', 'provision', chmod=MODE_755, python_fixup=True)
    95
    106bld.INSTALL_FILES('${SETUPDIR}', 'dns_update_list')
     
    128
    139for p in '''schema-map-* DB_CONFIG *.inf *.ldif *.reg *.zone *.conf *.php *.txt
    14             named.conf named.conf.update provision.smb.conf.dc provision.smb.conf.member
    15             provision.smb.conf.standalone'''.split():
     10            named.conf.update named.conf.dlz'''.split():
    1611    bld.INSTALL_WILDCARD('${SETUPDIR}', p)
    1712
Note: See TracChangeset for help on using the changeset viewer.