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/tests
Files:
1 added
6 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.