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/scripting/devel
Files:
6 added
5 edited

Legend:

Unmodified
Added
Removed

  • vendor/current/source4/scripting/devel/chgtdcpass

    r740 r988  
    3030from samba.auth import system_session
    3131from samba import param
     32from samba.provision import find_provision_key_parameters
    3233from samba.upgradehelpers import (get_paths,
    33                                  find_provision_key_parameters, get_ldbs,
     34                                  get_ldbs,
    3435                                 update_machine_account_password)
    3536

  • vendor/current/source4/scripting/devel/drs/vampire_ad.sh

    r740 r988  
    2424REALM="$(echo $DNSDOMAIN | tr '[a-z]' '[A-Z]')"
    2525
    26 sudo $GDB bin/samba-tool join $DNSDOMAIN DC -Uadministrator%$pass -s $PREFIX/etc/smb.conf --option=realm=$REALM --option="ads:dc function level=4" --option="ads:min function level=0" -d2 "$@" || exit 1
     26sudo $GDB bin/samba-tool domain join $DNSDOMAIN DC -Uadministrator%$pass -s $PREFIX/etc/smb.conf --option=realm=$REALM --option="ads:dc function level=4" --option="ads:min function level=0" -d2 "$@" || exit 1
    2727# PRIVATEDIR=$PREFIX/private sudo -E scripting/bin/setup_dns.sh $machine $DNSDOMAIN $machine_ip || exit 1
    2828#sudo rndc flush

  • vendor/current/source4/scripting/devel/getncchanges

    r740 r988  
    1414from samba.samdb import SamDB
    1515from samba.auth import system_session
     16from samba.ndr import ndr_unpack
    1617
    1718def do_DsBind(drs):
    … …  
    101102    parser.add_option("", "--exop", dest="exop", help="extended operation",)
    102103    parser.add_option("", "--pas", dest="use_pas", action='store_true', default=False,
    103                       help="send partial attribute set",)
    104     parser.add_option("", "--dest-dsa", type='str',
    105                       default='"9c637462-5b8c-4467-aef2-bdb1f57bc4ef"', help="destination DSA GUID")
     104                      help="send partial attribute set (for RODC)")
     105    parser.add_option("", "--nb-iter", type='int', help="Number of getncchange iterations")
     106    parser.add_option("", "--dest-dsa", type='str', help="destination DSA GUID")
     107    parser.add_option("", "--rodc", action='store_true', default=False,
     108                      help='use RODC replica flags')
     109    parser.add_option("", "--partial-rw", action='store_true', default=False,
     110                      help='use RW partial replica flags, not be confused with --pas')
    106111    parser.add_option("", "--replica-flags", type='int',
    107112                      default=drsuapi.DRSUAPI_DRS_INIT_SYNC |
    108113                      drsuapi.DRSUAPI_DRS_PER_SYNC |
     114                      drsuapi.DRSUAPI_DRS_WRIT_REP |
    109115                      drsuapi.DRSUAPI_DRS_GET_ANC |
    110116                      drsuapi.DRSUAPI_DRS_NEVER_SYNCED,
    … …  
    112118
    113119    (opts, args) = parser.parse_args()
     120    if opts.rodc:
     121        opts.replica_flags = drsuapi.DRSUAPI_DRS_INIT_SYNC |\
     122                             drsuapi.DRSUAPI_DRS_PER_SYNC |\
     123                             drsuapi.DRSUAPI_DRS_GET_ANC |\
     124                             drsuapi.DRSUAPI_DRS_NEVER_SYNCED |\
     125                             drsuapi.DRSUAPI_DRS_SPECIAL_SECRET_PROCESSING |\
     126                             drsuapi.DRSUAPI_DRS_GET_ALL_GROUP_MEMBERSHIP
     127
     128    if opts.partial_rw:
     129        opts.replica_flags = drsuapi.DRSUAPI_DRS_INIT_SYNC |\
     130                             drsuapi.DRSUAPI_DRS_PER_SYNC |\
     131                             drsuapi.DRSUAPI_DRS_GET_ANC |\
     132                             drsuapi.DRSUAPI_DRS_NEVER_SYNCED
    114133
    115134    lp = sambaopts.get_loadparm()
    … …  
    121140    if creds.is_anonymous():
    122141        parser.error("You must supply credentials")
     142
     143    if opts.partial_rw and opts.rodc:
     144        parser.error("Can't specify --partial-rw and --rodc")
    123145
    124146    server = args[0]
    … …  
    148170        exop = int(opts.exop)
    149171
     172    dest_dsa = opts.dest_dsa
     173    if not dest_dsa:
     174        print "no dest_dsa specified trying to figure out from ldap"
     175        msgs = samdb.search(controls=["search_options:1:2"],
     176                           expression='(objectclass=ntdsdsa)')
     177        if len(msgs) == 1:
     178            dest_dsa = str(ndr_unpack(misc.GUID,  msgs[0]["invocationId"][0]))
     179            print "Found this dsa: %s" % dest_dsa
     180        else:
     181            # TODO fixme
     182            pass
     183        if not dest_dsa:
     184            print "Unable to find the dest_dsa automatically please specify it"
     185            import sys
     186            sys.exit(1)
     187
    150188    null_guid = misc.GUID()
    151     req8.destination_dsa_guid               = misc.GUID(opts.dest_dsa)
     189    req8.destination_dsa_guid               = misc.GUID(dest_dsa)
    152190    req8.source_dsa_invocation_id           = misc.GUID(samdb.get_invocation_id())
    153191    req8.naming_context                     = drsuapi.DsReplicaObjectIdentifier()
    … …  
    171209    req8.mapping_ctr.mappings                = None
    172210
     211    nb_iter = 0
    173212    while True:
    174213        (level, ctr) = drs.DsGetNCChanges(drs_handle, 8, req8)
    175         if ctr.more_data == 0:
     214        nb_iter += 1
     215        if ctr.more_data == 0 or opts.nb_iter == nb_iter:
    176216            break
    177         req8.highwatermark.tmp_highest_usn = ctr.new_highwatermark.tmp_highest_usn
     217        req8.highwatermark = ctr.new_highwatermark

  • vendor/current/source4/scripting/devel/selftest-vars.sh

    r740 r988  
    33
    44export UID_WRAPPER=1
    5 export NSS_WRAPPER_PASSWD=st/dc/passwd
    6 export NSS_WRAPPER_GROUP=st/dc/group
    7 export CONFIGURATION="--configfile=$PWD/st/dc/etc/smb.conf"
     5export NSS_WRAPPER_PASSWD=$PWD/st/ad_dc_ntvfs/passwd
     6export NSS_WRAPPER_GROUP=$PWD/st/ad_dc_ntvfs/group
     7export CONFIGURATION="--configfile=$PWD/st/ad_dc_ntvfs/etc/smb.conf"
     8export VAMPIRE_DC_SERVER=localvampiredc
     9export VAMPIRE_DC_SERVER_IP=127.0.0.22
     10export VAMPIRE_DC_NETBIOSNAME=localvampiredc1
     11export VAMPIRE_DC_NETBIOSALIAS=localvampiredc
    812export MEMBER_SERVER=localmember3
    9 export MEMBER_SERVER_IP=127.0.0.3
     13export MEMBER_SERVER_IP=127.0.0.23
    1014export MEMBER_NETBIOSNAME=localmember3
    1115export MEMBER_NETBIOSALIAS=localmember
    1216export RPC_PROXY_SERVER=localrpcproxy4
    13 export RPC_PROXY_SERVER_IP=127.0.0.4
     17export RPC_PROXY_SERVER_IP=127.0.0.24
    1418export RPC_PROXY_NETBIOSNAME=localrpcproxy4
    1519export RPC_PROXY_NETBIOSALIAS=localrpcproxy
    16 export SELFTEST_TARGET="samba4"
    1720export SELFTEST_MAXTIME=1200
    1821export NETBIOSNAME=localdc1
    1922export REALM=SAMBA.EXAMPLE.COM
    20 export SOCKET_WRAPPER_DEFAULT_IFACE=1
     23export SOCKET_WRAPPER_DEFAULT_IFACE=21
    2124export SERVER=localdc1
    22 export WINBINDD_SOCKET_DIR=$PWD/st/dc/winbindd_socket
     25export SELFTEST_WINBINDD_SOCKET_DIR=$PWD/st/ad_dc_ntvfs/winbindd_socket
    2326export SELFTEST_PREFIX=$PWD/st
    2427export DOMAIN=SAMBADOMAIN
    25 export BUILDDIR=.
    26 export DC_SERVER_IP=127.0.0.1
     28export BINDIR=./bin
     29export DC_SERVER_IP=127.0.0.21
    2730export SELFTEST_INTERFACES=127.0.0.6/8,127.0.0.7/8,127.0.0.8/8,127.0.0.9/8,127.0.0.10/8,127.0.0.11/8
    2831export SOCKET_WRAPPER_DIR=$PWD/st/w
    2932export DC_USERNAME=Administrator
    3033export USERNAME=Administrator
    31 export SERVER_IP=127.0.0.1
    32 export KRB5_CONFIG=$PWD/st/dc/etc/krb5.conf
     34export SERVER_IP=127.0.0.21
     35export KRB5_CONFIG=$PWD/st/ad_dc_ntvfs/etc/krb5.conf
    3336export PREFIX_ABS=$PWD/st
    3437export SRCDIR_ABS=$PWD
    35 export PREFIX=./st
    36 export KRB5CCNAME=./st/krb5ticket
    37 export SRCDIR=.
     38export PREFIX=$PWD/st
     39export KRB5CCNAME=$PWD/st/krb5ticket
     40export SRCDIR=$PWD/
    3841export TLS_ENABLED=yes
    3942export DC_NETBIOSALIAS=localdc
    … …  
    4447export PASSWORD=locDCpass1
    4548export NETBIOSALIAS=localdc
    46 export SMB_CONF_PATH=$PWD/st/dc/etc/smb.conf
     49export SMB_CONF_PATH=$PWD/st/ad_dc_ntvfs/etc/smb.conf

  • vendor/current/source4/scripting/devel/speedtest.py

    r740 r988  
    3131sys.path.insert(0, "bin/python")
    3232import samba
    33 samba.ensure_external_module("testtools", "testtools")
    34 samba.ensure_external_module("subunit", "subunit/python")
     33from samba.tests.subunitrun import TestProgram, SubunitOptions
    3534
    3635import samba.getopt as options
    3736
    38 from ldb import (
    39             SCOPE_BASE, SCOPE_SUBTREE, LdbError, ERR_NO_SUCH_OBJECT,
    40                 ERR_UNWILLING_TO_PERFORM, ERR_INSUFFICIENT_ACCESS_RIGHTS)
    41 from samba.ndr import ndr_pack, ndr_unpack
     37from ldb import SCOPE_BASE, SCOPE_SUBTREE
     38from samba.ndr import ndr_unpack
    4239from samba.dcerpc import security
    4340
    … …  
    4845import samba.tests
    4946from samba.tests import delete_force
    50 from subunit.run import SubunitTestRunner
    51 import unittest
    5247
    5348parser = optparse.OptionParser("speedtest.py [options] <host>")
    … …  
    5651parser.add_option_group(options.VersionOptions(parser))
    5752
    58 
    5953# use command line creds if available
    6054credopts = options.CredentialsOptions(parser)
    6155parser.add_option_group(credopts)
     56subunitopts = SubunitOptions(parser)
     57parser.add_option_group(subunitopts)
    6258opts, args = parser.parse_args()
    6359
    … …  
    233229ldb = SamDB(host, credentials=creds, session_info=system_session(), lp=lp, options=ldb_options)
    234230
    235 runner = SubunitTestRunner()
    236 rc = 0
    237 if not runner.run(unittest.makeSuite(SpeedTestAddDel)).wasSuccessful():
    238     rc = 1
    239 if not runner.run(unittest.makeSuite(AclSearchSpeedTest)).wasSuccessful():
    240     rc = 1
    241 sys.exit(rc)
     231TestProgram(module=__name__, opts=subunitopts)
Note: See TracChangeset for help on using the changeset viewer.