X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=selftest%2Ftarget%2FSamba4.pm;h=fa7988f67aa5d08389e8320afdfa2da1f7db249b;hb=8a4b5cdfea7b2370b9d700e7dbdaa8143cfc972c;hp=53237e050012f7d72301c7638ec4ddf33a977ce5;hpb=99f514f233fb1b3dcdd19cd2cc9ca9130ea841c8;p=kai%2Fsamba.git diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index 53237e05001..fa7988f67aa 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -9,25 +9,31 @@ use strict; use Cwd qw(abs_path); use FindBin qw($RealBin); use POSIX; +use SocketWrapper; +use target::Samba; +use target::Samba3; sub new($$$$$) { - my ($classname, $bindir, $ldap, $setupdir, $exeext) = @_; + my ($classname, $bindir, $binary_mapping, $ldap, $srcdir, $exeext, $server_maxtime) = @_; $exeext = "" unless defined($exeext); - my $self = { - vars => {}, - ldap => $ldap, - bindir => $bindir, - setupdir => $setupdir, - exeext => $exeext + + my $self = { + vars => {}, + ldap => $ldap, + bindir => $bindir, + binary_mapping => $binary_mapping, + srcdir => $srcdir, + exeext => $exeext, + server_maxtime => $server_maxtime, + target3 => new Samba3($bindir, $binary_mapping, $srcdir, $exeext, $server_maxtime) }; bless $self; return $self; } -sub bindir_path($$) { +sub scriptdir_path($$) { my ($self, $path) = @_; - - return "$self->{bindir}/$path$self->{exeext}"; + return "$self->{srcdir}/source4/scripting/$path"; } sub openldap_start($$$) { @@ -37,7 +43,7 @@ sub slapd_start($$) { my $count = 0; my ($self, $env_vars) = @_; - my $ldbsearch = $self->bindir_path("ldbsearch"); + my $ldbsearch = Samba::bindir_path($self, "ldbsearch"); my $uri = $env_vars->{LDAP_URI}; @@ -79,16 +85,17 @@ sub slapd_stop($$) return 1; } -sub check_or_start($$$) +sub check_or_start($$$) { - my ($self, $env_vars, $max_time) = @_; + my ($self, $env_vars, $process_model) = @_; return 0 if ( -p $env_vars->{SAMBA_TEST_FIFO}); unlink($env_vars->{SAMBA_TEST_FIFO}); POSIX::mkfifo($env_vars->{SAMBA_TEST_FIFO}, 0700); unlink($env_vars->{SAMBA_TEST_LOG}); - print "STARTING SAMBA... "; + my $pwd = `pwd`; + print "STARTING SAMBA for $ENV{ENVNAME}\n"; my $pid = fork(); if ($pid == 0) { open STDIN, $env_vars->{SAMBA_TEST_FIFO}; @@ -103,9 +110,9 @@ sub check_or_start($$$) my $valgrind = ""; if (defined($ENV{SAMBA_VALGRIND})) { $valgrind = $ENV{SAMBA_VALGRIND}; - } + } - $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG}; + $ENV{KRB5_CONFIG} = $env_vars->{KRB5_CONFIG}; $ENV{WINBINDD_SOCKET_DIR} = $env_vars->{WINBINDD_SOCKET_DIR}; $ENV{NSS_WRAPPER_PASSWD} = $env_vars->{NSS_WRAPPER_PASSWD}; @@ -122,37 +129,32 @@ sub check_or_start($$$) } my $optarg = ""; - if (defined($max_time)) { - $optarg = "--maximum-runtime=$max_time "; - } + $optarg = "--maximum-runtime=$self->{server_maxtime}"; if (defined($ENV{SAMBA_OPTIONS})) { $optarg.= " $ENV{SAMBA_OPTIONS}"; } - my $samba = $self->bindir_path("samba"); - - # allow selection of the process model using - # the environment varibale SAMBA_PROCESS_MODEL - # that allows us to change the process model for - # individual machines in the build farm - my $model = "single"; - if (defined($ENV{SAMBA_PROCESS_MODEL})) { - $model = $ENV{SAMBA_PROCESS_MODEL}; - } - my $ret = system("$valgrind $samba $optarg $env_vars->{CONFIGURATION} -M $model -i"); - if ($? == -1) { - print "Unable to start $samba: $ret: $!\n"; + my $samba = Samba::bindir_path($self, "samba"); + + chomp($pwd); + my $cmdline = "$valgrind ${pwd}/$samba $optarg $env_vars->{CONFIGURATION} -M $process_model -i"; + my $ret = system("$cmdline"); + if ($ret == -1) { + print "Unable to start $cmdline: $ret: $!\n"; exit 1; } + my $exit = ($ret >> 8); unlink($env_vars->{SAMBA_TEST_FIFO}); - my $exit = $? >> 8; if ($ret == 0) { - print "$samba exits with status $exit\n"; + print "$samba exited with no error\n"; + exit 0; } elsif ( $ret & 127 ) { print "$samba got signal ".($ret & 127)." and exits with $exit!\n"; } else { - $ret = $? >> 8; print "$samba failed with status $exit!\n"; } + if ($exit == 0) { + $exit = -1; + } exit $exit; } print "DONE\n"; @@ -169,21 +171,21 @@ sub wait_for_start($$) print "delaying for nbt name registration\n"; sleep 2; - # This will return quickly when things are up, but be slow if we - # need to wait for (eg) SSL init - my $nmblookup = $self->bindir_path("nmblookup"); + # This will return quickly when things are up, but be slow if we + # need to wait for (eg) SSL init + my $nmblookup = Samba::bindir_path($self, "nmblookup"); system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}"); system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{SERVER}"); system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}"); system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}"); - system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSALIAS}"); - system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSALIAS}"); + system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}"); + system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}"); system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{SERVER}"); system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{SERVER}"); system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}"); system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}"); - system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSALIAS}"); - system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSALIAS}"); + system("$nmblookup $testenv_vars->{CONFIGURATION} $testenv_vars->{NETBIOSNAME}"); + system("$nmblookup $testenv_vars->{CONFIGURATION} -U $testenv_vars->{SERVER_IP} $testenv_vars->{NETBIOSNAME}"); print $self->getlog_env($testenv_vars); } @@ -192,7 +194,7 @@ sub write_ldb_file($$$) { my ($self, $file, $ldif) = @_; - my $ldbadd = $self->bindir_path("ldbadd"); + my $ldbadd = Samba::bindir_path($self, "ldbadd"); open(LDIF, "|$ldbadd -H $file >/dev/null"); print LDIF $ldif; return(close(LDIF)); @@ -264,7 +266,7 @@ YX70obsCAQI= EOF close(DHFILE); - #Likewise, we pregenerate the key material. This allows the + #Likewise, we pregenerate the key material. This allows the #other certificates to be pre-generated open(KEYFILE, ">$keyfile"); print KEYFILE <$certfile"); print CERTFILE <{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file"; $ctx->{server_role} = $server_role; + $ctx->{hostname} = $hostname; $ctx->{netbiosname} = $netbiosname; - $ctx->{netbiosalias} = $netbiosalias; $ctx->{swiface} = $swiface; $ctx->{password} = $password; $ctx->{kdc_ipv4} = $kdc_ipv4; - $ctx->{server_loglevel} = 1; + $ctx->{server_loglevel} =$ENV{SERVER_LOG_LEVEL} || 1; $ctx->{username} = "Administrator"; $ctx->{domain} = $domain; $ctx->{realm} = uc($realm); @@ -499,6 +502,8 @@ sub provision_raw_prepare($$$$$$$$$$) $ctx->{privatedir} = "$prefix_abs/private"; $ctx->{ncalrpcdir} = "$prefix_abs/ncalrpc"; $ctx->{lockdir} = "$prefix_abs/lockdir"; + $ctx->{statedir} = "$prefix_abs/statedir"; + $ctx->{cachedir} = "$prefix_abs/cachedir"; $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket"; $ctx->{winbindd_privileged_socket_dir} = "$prefix_abs/winbindd_privileged_socket"; $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket"; @@ -513,8 +518,9 @@ sub provision_raw_prepare($$$$$$$$$$) push(@{$ctx->{directories}}, $ctx->{privatedir}); push(@{$ctx->{directories}}, $ctx->{etcdir}); push(@{$ctx->{directories}}, $ctx->{piddir}); - push(@{$ctx->{directories}}, $ctx->{ncalrpcdir}); push(@{$ctx->{directories}}, $ctx->{lockdir}); + push(@{$ctx->{directories}}, $ctx->{statedir}); + push(@{$ctx->{directories}}, $ctx->{cachedir}); $ctx->{smb_conf_extra_options} = ""; @@ -523,16 +529,24 @@ sub provision_raw_prepare($$$$$$$$$$) push (@provision_options, "NSS_WRAPPER_GROUP=\"$ctx->{nsswrap_group}\""); if (defined($ENV{GDB_PROVISION})) { push (@provision_options, "gdb --args"); + if (!defined($ENV{PYTHON})) { + push (@provision_options, "env"); + push (@provision_options, "python"); + } } if (defined($ENV{VALGRIND_PROVISION})) { push (@provision_options, "valgrind"); + if (!defined($ENV{PYTHON})) { + push (@provision_options, "env"); + push (@provision_options, "python"); + } } if (defined($ENV{PYTHON})) { push (@provision_options, $ENV{PYTHON}); } - push (@provision_options, "$self->{setupdir}/provision"); + push (@provision_options, "$self->{srcdir}/source4/setup/provision"); push (@provision_options, "--configfile=$ctx->{smb_conf}"); - push (@provision_options, "--host-name=$ctx->{netbiosname}"); + push (@provision_options, "--host-name=$ctx->{hostname}"); push (@provision_options, "--host-ip=$ctx->{ipv4}"); push (@provision_options, "--quiet"); push (@provision_options, "--domain=$ctx->{domain}"); @@ -543,6 +557,7 @@ sub provision_raw_prepare($$$$$$$$$$) push (@provision_options, "--root=$ctx->{unix_name}"); push (@provision_options, "--server-role=\"$ctx->{server_role}\""); push (@provision_options, "--function-level=\"$ctx->{functional_level}\""); + push (@provision_options, "--dns-backend=BIND9_DLZ"); @{$ctx->{provision_options}} = @provision_options; @@ -562,19 +577,21 @@ sub provision_raw_step1($$) warn("can't open $ctx->{smb_conf}$?"); return undef; } + my $acl = "false"; + $acl = "true" if (defined $ENV{WITH_ACL}); print CONFFILE " [global] + acl:search = $acl netbios name = $ctx->{netbiosname} - netbios aliases = $ctx->{netbiosalias} - posix:eadb = $ctx->{lockdir}/eadb.tdb + posix:eadb = $ctx->{statedir}/eadb.tdb workgroup = $ctx->{domain} realm = $ctx->{realm} private dir = $ctx->{privatedir} pid directory = $ctx->{piddir} ncalrpc dir = $ctx->{ncalrpcdir} lock dir = $ctx->{lockdir} - setup directory = $self->{setupdir} - modules dir = $self->{bindir}/modules + state directory = $ctx->{statedir} + cache directory = $ctx->{cachedir} winbindd socket directory = $ctx->{winbindd_socket_dir} winbindd privileged socket directory = $ctx->{winbindd_privileged_socket_dir} ntp signd socket directory = $ctx->{ntp_signd_socket_dir} @@ -582,9 +599,10 @@ sub provision_raw_step1($$) name resolve order = file bcast interfaces = $ctx->{interfaces} tls dh params file = $ctx->{tlsdir}/dhparms.pem - panic action = $RealBin/gdb_backtrace \%PID% \%PROG% + panic action = $RealBin/gdb_backtrace \%d wins support = yes server role = $ctx->{server_role} + server services = +echo +dns notify:inotify = false ldb:nosync = true #We don't want to pass our self-tests if the PAC code is wrong @@ -592,10 +610,17 @@ sub provision_raw_step1($$) log level = $ctx->{server_loglevel} lanman auth = Yes rndc command = true - dns update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file} - spn update command = $ENV{SRCDIR_ABS}/scripting/bin/samba_spnupdate + dns update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_dnsupdate --all-interfaces --use-file=$ctx->{dns_host_file} + spn update command = $ENV{SRCDIR_ABS}/source4/scripting/bin/samba_spnupdate resolv:host file = $ctx->{dns_host_file} dreplsrv:periodic_startup_interval = 0 + dsdb:schema update allowed = yes + + passdb backend = samba4 + + # remove this again, when our smb2 client library + # supports signin on compound related requests + server signing = on "; if (defined($ctx->{sid_generator}) && $ctx->{sid_generator} ne "internal") { @@ -613,49 +638,12 @@ sub provision_raw_step1($$) $self->mk_keyblobs($ctx->{tlsdir}); - unless (open(KRB5CONF, ">$ctx->{krb5_conf}")) { - warn("can't open $ctx->{krb5_conf}$?"); - return undef; - } - print KRB5CONF " -#Generated krb5.conf for $ctx->{realm} - -[libdefaults] - default_realm = $ctx->{realm} - dns_lookup_realm = false - dns_lookup_kdc = false - ticket_lifetime = 24h - forwardable = yes - -[realms] - $ctx->{realm} = { - kdc = $ctx->{kdc_ipv4}:88 - admin_server = $ctx->{kdc_ipv4}:88 - default_domain = $ctx->{dnsname} - } - $ctx->{dnsname} = { - kdc = $ctx->{kdc_ipv4}:88 - admin_server = $ctx->{kdc_ipv4}:88 - default_domain = $ctx->{dnsname} - } - $ctx->{domain} = { - kdc = $ctx->{kdc_ipv4}:88 - admin_server = $ctx->{kdc_ipv4}:88 - default_domain = $ctx->{dnsname} - } - -[appdefaults] - pkinit_anchors = FILE:$ctx->{tlsdir}/ca.pem - -[kdc] - enable-pkinit = true - pkinit_identity = FILE:$ctx->{tlsdir}/kdc.pem,$ctx->{tlsdir}/key.pem - pkinit_anchors = FILE:$ctx->{tlsdir}/ca.pem - -[domain_realm] - .$ctx->{dnsname} = $ctx->{realm} -"; - close(KRB5CONF); + #Default the KDC IP to the server's IP + if (not defined($ctx->{kdc_ipv4})) { + $ctx->{kdc_ipv4} = $ctx->{ipv4}; + } + + Samba::mk_krb5_conf($ctx, ""); open(PWD, ">$ctx->{nsswrap_passwd}"); print PWD " @@ -678,13 +666,12 @@ nogroup:x:65534:nobody my $configuration = "--configfile=$ctx->{smb_conf}"; #Ensure the config file is valid before we start - my $testparm = $self->bindir_path("../scripting/bin/testparm"); + my $testparm = Samba::bindir_path($self, "samba-tool") . " testparm"; if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) { system("$testparm -v --suppress-prompt $configuration >&2"); warn("Failed to create a valid smb.conf configuration $testparm!"); return undef; } - unless (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) { warn("Failed to create a valid smb.conf configuration! $testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global"); return undef; @@ -693,10 +680,9 @@ nogroup:x:65534:nobody my $ret = { KRB5_CONFIG => $ctx->{krb5_conf}, PIDDIR => $ctx->{piddir}, - SERVER => $ctx->{netbiosname}, + SERVER => $ctx->{hostname}, SERVER_IP => $ctx->{ipv4}, NETBIOSNAME => $ctx->{netbiosname}, - NETBIOSALIAS => $ctx->{netbiosalias}, DOMAIN => $ctx->{domain}, USERNAME => $ctx->{username}, REALM => $ctx->{realm}, @@ -706,6 +692,8 @@ nogroup:x:65534:nobody WINBINDD_SOCKET_DIR => $ctx->{winbindd_socket_dir}, NCALRPCDIR => $ctx->{ncalrpcdir}, LOCKDIR => $ctx->{lockdir}, + STATEDIR => $ctx->{statedir}, + CACHEDIR => $ctx->{cachedir}, SERVERCONFFILE => $ctx->{smb_conf}, CONFIGURATION => $configuration, SOCKET_WRAPPER_DEFAULT_IFACE => $ctx->{swiface}, @@ -737,12 +725,12 @@ sub provision_raw_step2($$$) sub provision($$$$$$$$$) { - my ($self, $prefix, $server_role, $netbiosname, $netbiosalias, - $domain, $realm, $functional_level, + my ($self, $prefix, $server_role, $hostname, + $domain, $realm, $functional_level, $swiface, $password, $kdc_ipv4, $extra_smbconf_options) = @_; my $ctx = $self->provision_raw_prepare($prefix, $server_role, - $netbiosname, $netbiosalias, + $hostname, $domain, $realm, $functional_level, $swiface, $password, $kdc_ipv4); @@ -756,10 +744,11 @@ sub provision($$$$$$$$$) max xmit = 32K server max protocol = SMB2 - $extra_smbconf_options host msdfs = $msdfs lanman auth = yes + $extra_smbconf_options + [tmp] path = $ctx->{tmpdir} read only = no @@ -767,6 +756,13 @@ sub provision($$$$$$$$$) posix:oplocktimeout = 3 posix:writetimeupdatedelay = 500000 +[xcopy_share] + path = $ctx->{tmpdir} + read only = no + posix:sharedelay = 10000 + posix:oplocktimeout = 3 + posix:writetimeupdatedelay = 500000 + [test1] path = $ctx->{tmpdir}/test1 read only = no @@ -786,8 +782,10 @@ sub provision($$$$$$$$$) ntvfs handler = cifs cifs:server = $ctx->{netbiosname} cifs:share = tmp -#There is no username specified here, instead the client is expected -#to log in with kerberos, and the serverwill use delegated credentials. + cifs:use-s4u2proxy = yes + # There is no username specified here, instead the client is expected + # to log in with kerberos, and the serverwill use delegated credentials. + # Or the server tries s4u2self/s4u2proxy to impersonate the client [simple] path = $ctx->{tmpdir} @@ -795,11 +793,11 @@ sub provision($$$$$$$$$) ntvfs handler = simple [sysvol] - path = $ctx->{lockdir}/sysvol + path = $ctx->{statedir}/sysvol read only = yes [netlogon] - path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts + path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts read only = no [cifsposix] @@ -823,7 +821,7 @@ sub provision($$$$$$$$$) } my $ret = $self->provision_raw_step1($ctx); - unless ($ret) { + unless (defined $ret) { return undef; } @@ -853,12 +851,11 @@ sub provision_member($$$) my $ret = $self->provision($prefix, "member server", - "localmember", - "member3", - "SAMBADOMAIN", - "samba.example.com", + "s4member", + "SAMBADOMAIN", + "samba.example.com", "2008", - 3, + 23, "locMEMpass3", $dcvars->{SERVER_IP}, ""); @@ -866,12 +863,13 @@ sub provision_member($$$) return undef; } - my $net = $self->bindir_path("net"); + my $samba_tool = Samba::bindir_path($self, "samba-tool"); my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} member"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; + $cmd .= " --machinepass=machine$ret->{password}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -881,14 +879,12 @@ sub provision_member($$$) $ret->{MEMBER_SERVER} = $ret->{SERVER}; $ret->{MEMBER_SERVER_IP} = $ret->{SERVER_IP}; $ret->{MEMBER_NETBIOSNAME} = $ret->{NETBIOSNAME}; - $ret->{MEMBER_NETBIOSALIAS} = $ret->{NETBIOSALIAS}; $ret->{MEMBER_USERNAME} = $ret->{USERNAME}; $ret->{MEMBER_PASSWORD} = $ret->{PASSWORD}; $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME}; - $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS}; $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME}; $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD}; @@ -900,19 +896,32 @@ sub provision_rpc_proxy($$$) my ($self, $prefix, $dcvars) = @_; print "PROVISIONING RPC PROXY..."; - my $extra_smbconf_options = "dcerpc_remote:binding = ncacn_ip_tcp:localdc - dcerpc endpoint servers = epmapper, remote - dcerpc_remote:interfaces = rpcecho + my $extra_smbconf_options = " + + # rpc_proxy + dcerpc_remote:binding = ncacn_ip_tcp:$dcvars->{SERVER} + dcerpc endpoint servers = epmapper, remote + dcerpc_remote:interfaces = rpcecho + +[cifs_to_dc] + read only = no + ntvfs handler = cifs + cifs:server = $dcvars->{SERVER} + cifs:share = cifs + cifs:use-s4u2proxy = yes + # There is no username specified here, instead the client is expected + # to log in with kerberos, and the serverwill use delegated credentials. + # Or the server tries s4u2self/s4u2proxy to impersonate the client + "; my $ret = $self->provision($prefix, "member server", "localrpcproxy", - "rpcproxy4", - "SAMBADOMAIN", - "samba.example.com", + "SAMBADOMAIN", + "samba.example.com", "2008", - 4, + 24, "locRPCproxypass4", $dcvars->{SERVER_IP}, $extra_smbconf_options); @@ -921,25 +930,57 @@ sub provision_rpc_proxy($$$) return undef; } - my $net = $self->bindir_path("net"); + my $samba_tool = Samba::bindir_path($self, "samba-tool"); + + # The joind runs in the context of the rpc_proxy/member for now my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} member"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} member"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; + $cmd .= " --machinepass=machine$ret->{password}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); return undef; } + # Setting up delegation runs in the context of the DC for now + $cmd = ""; + $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$dcvars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; + $cmd .= "KRB5_CONFIG=\"$dcvars->{KRB5_CONFIG}\" "; + $cmd .= "$samba_tool delegation for-any-protocol '$ret->{NETBIOSNAME}\$' on"; + $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} $dcvars->{CONFIGURATION}"; + + unless (system($cmd) == 0) { + warn("Delegation failed\n$cmd"); + return undef; + } + + # Setting up delegation runs in the context of the DC for now + $cmd = ""; + $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$dcvars->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; + $cmd .= "KRB5_CONFIG=\"$dcvars->{KRB5_CONFIG}\" "; + $cmd .= "$samba_tool delegation add-service '$ret->{NETBIOSNAME}\$' cifs/$dcvars->{SERVER}"; + $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} $dcvars->{CONFIGURATION}"; + + unless (system($cmd) == 0) { + warn("Delegation failed\n$cmd"); + return undef; + } + $ret->{RPC_PROXY_SERVER} = $ret->{SERVER}; $ret->{RPC_PROXY_SERVER_IP} = $ret->{SERVER_IP}; $ret->{RPC_PROXY_NETBIOSNAME} = $ret->{NETBIOSNAME}; - $ret->{RPC_PROXY_NETBIOSALIAS} = $ret->{NETBIOSALIAS}; $ret->{RPC_PROXY_USERNAME} = $ret->{USERNAME}; $ret->{RPC_PROXY_PASSWORD} = $ret->{PASSWORD}; + $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; + $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; + $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME}; + $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME}; + $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD}; + return $ret; } @@ -951,11 +992,10 @@ sub provision_vampire_dc($$$) # We do this so that we don't run the provision. That's the job of 'net vampire'. my $ctx = $self->provision_raw_prepare($prefix, "domain controller", "localvampiredc", - "dc2", - "SAMBADOMAIN", - "samba.example.com", + "SAMBADOMAIN", + "samba.example.com", "2008", - 2, $dcvars->{PASSWORD}, + 22, $dcvars->{PASSWORD}, $dcvars->{SERVER_IP}); $ctx->{smb_conf_extra_options} = " @@ -963,11 +1003,11 @@ sub provision_vampire_dc($$$) server max protocol = SMB2 [sysvol] - path = $ctx->{lockdir}/sysvol + path = $ctx->{statedir}/sysvol read only = yes [netlogon] - path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts + path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts read only = no "; @@ -977,12 +1017,13 @@ sub provision_vampire_dc($$$) return undef; } - my $net = $self->bindir_path("net"); + my $samba_tool = Samba::bindir_path($self, "samba-tool"); my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net vampire $ret->{CONFIGURATION} $dcvars->{REALM} --realm=$dcvars->{REALM}"; - $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} DC --realm=$dcvars->{REALM}"; + $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD} --domain-critical-only"; + $cmd .= " --machinepass=machine$ret->{password}"; unless (system($cmd) == 0) { warn("Join failed\n$cmd"); @@ -992,12 +1033,73 @@ sub provision_vampire_dc($$$) $ret->{VAMPIRE_DC_SERVER} = $ret->{SERVER}; $ret->{VAMPIRE_DC_SERVER_IP} = $ret->{SERVER_IP}; $ret->{VAMPIRE_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; - $ret->{VAMPIRE_DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS}; $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME}; - $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS}; + $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME}; + $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD}; + + return $ret; +} + +sub provision_subdom_dc($$$) +{ + my ($self, $prefix, $dcvars) = @_; + print "PROVISIONING SUBDOMAIN DC..."; + + # We do this so that we don't run the provision. That's the job of 'net vampire'. + my $ctx = $self->provision_raw_prepare($prefix, "domain controller", + "localsubdc", + "SAMBASUBDOM", + "sub.samba.example.com", + "2008", + 31, $dcvars->{PASSWORD}, + undef); + + $ctx->{smb_conf_extra_options} = " + max xmit = 32K + server max protocol = SMB2 + +[sysvol] + path = $ctx->{statedir}/sysvol + read only = yes + +[netlogon] + path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts + read only = no + +"; + + my $ret = $self->provision_raw_step1($ctx); + unless ($ret) { + return undef; + } + + my $dc_realms = Samba::mk_realms_stanza($dcvars->{REALM}, lc($dcvars->{REALM}), + $dcvars->{DOMAIN}, $dcvars->{SERVER_IP}); + Samba::mk_krb5_conf($ctx, $dc_realms); + + my $samba_tool = Samba::bindir_path($self, "samba-tool"); + my $cmd = ""; + $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; + $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $ctx->{realm} subdomain "; + $cmd .= "--parent-domain=$dcvars->{REALM} -U$dcvars->{DC_USERNAME}\@$dcvars->{REALM}\%$dcvars->{DC_PASSWORD}"; + $cmd .= " --machinepass=machine$ret->{password}"; + + unless (system($cmd) == 0) { + warn("Join failed\n$cmd"); + return undef; + } + + $ret->{SUBDOM_DC_SERVER} = $ret->{SERVER}; + $ret->{SUBDOM_DC_SERVER_IP} = $ret->{SERVER_IP}; + $ret->{SUBDOM_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; + + $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; + $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; + $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME}; $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME}; $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD}; @@ -1012,23 +1114,22 @@ sub provision_dc($$) my $ret = $self->provision($prefix, "domain controller", "localdc", - "dc1", - "SAMBADOMAIN", - "samba.example.com", + "SAMBADOMAIN", + "samba.example.com", "2008", - 1, + 21, "locDCpass1", - "127.0.0.1", ""); + undef, "netbios aliases = localDC1-a"); + return undef unless(defined $ret); unless($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); return undef; } - + $ret->{NETBIOSALIAS} = "localdc1-a"; $ret->{DC_SERVER} = $ret->{SERVER}; $ret->{DC_SERVER_IP} = $ret->{SERVER_IP}; $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; - $ret->{DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS}; $ret->{DC_USERNAME} = $ret->{USERNAME}; $ret->{DC_PASSWORD} = $ret->{PASSWORD}; @@ -1043,13 +1144,12 @@ sub provision_fl2000dc($$) my $ret = $self->provision($prefix, "domain controller", "dc5", - "localfl2000dc", - "SAMBA2000", - "samba2000.example.com", + "SAMBA2000", + "samba2000.example.com", "2000", - 5, + 25, "locDCpass5", - "127.0.0.5", ""); + undef, ""); unless($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); @@ -1067,13 +1167,12 @@ sub provision_fl2003dc($$) my $ret = $self->provision($prefix, "domain controller", "dc6", - "localfl2003dc", "SAMBA2003", "samba2003.example.com", "2003", - 6, + 26, "locDCpass6", - "127.0.0.6", ""); + undef, ""); unless($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); @@ -1091,13 +1190,12 @@ sub provision_fl2008r2dc($$) my $ret = $self->provision($prefix, "domain controller", "dc7", - "localfl2000r2dc", "SAMBA2008R2", "samba2008R2.example.com", "2008_R2", - 7, + 27, "locDCpass7", - "127.0.0.7", ""); + undef, ""); unless ($self->add_wins_config("$prefix/private")) { warn("Unable to add wins configuration"); @@ -1116,11 +1214,10 @@ sub provision_rodc($$$) # We do this so that we don't run the provision. That's the job of 'net join RODC'. my $ctx = $self->provision_raw_prepare($prefix, "domain controller", "rodc", - "dc8", "SAMBADOMAIN", "samba.example.com", "2008", - 8, $dcvars->{PASSWORD}, + 28, $dcvars->{PASSWORD}, $dcvars->{SERVER_IP}); unless ($ctx) { return undef; @@ -1134,11 +1231,11 @@ sub provision_rodc($$$) server max protocol = SMB2 [sysvol] - path = $ctx->{lockdir}/sysvol + path = $ctx->{statedir}/sysvol read only = yes [netlogon] - path = $ctx->{lockdir}/sysvol/$ctx->{dnsname}/scripts + path = $ctx->{statedir}/sysvol/$ctx->{dnsname}/scripts read only = yes [tmp] @@ -1155,11 +1252,11 @@ sub provision_rodc($$$) return undef; } - my $net = $self->bindir_path("net"); + my $samba_tool = Samba::bindir_path($self, "samba-tool"); my $cmd = ""; $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$ret->{SOCKET_WRAPPER_DEFAULT_IFACE}\" "; $cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" "; - $cmd .= "$net join $ret->{CONFIGURATION} $dcvars->{REALM} RODC"; + $cmd .= "$samba_tool domain join $ret->{CONFIGURATION} $dcvars->{REALM} RODC"; $cmd .= " -U$dcvars->{DC_USERNAME}\%$dcvars->{DC_PASSWORD}"; $cmd .= " --server=$dcvars->{DC_SERVER}"; @@ -1168,21 +1265,60 @@ sub provision_rodc($$$) return undef; } + # we overwrite the kdc after the RODC join + # so that use the RODC as kdc and test + # the proxy code + $ctx->{kdc_ipv4} = $ret->{SERVER_IP}; + Samba::mk_krb5_conf($ctx); + $ret->{RODC_DC_SERVER} = $ret->{SERVER}; $ret->{RODC_DC_SERVER_IP} = $ret->{SERVER_IP}; $ret->{RODC_DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; - $ret->{RODC_DC_NETBIOSALIAS} = $ret->{NETBIOSALIAS}; $ret->{DC_SERVER} = $dcvars->{DC_SERVER}; $ret->{DC_SERVER_IP} = $dcvars->{DC_SERVER_IP}; $ret->{DC_NETBIOSNAME} = $dcvars->{DC_NETBIOSNAME}; - $ret->{DC_NETBIOSALIAS} = $dcvars->{DC_NETBIOSALIAS}; $ret->{DC_USERNAME} = $dcvars->{DC_USERNAME}; $ret->{DC_PASSWORD} = $dcvars->{DC_PASSWORD}; return $ret; } +sub provision_plugin_s4_dc($$) +{ + my ($self, $prefix) = @_; + + my $extra_smbconf_options = " +server services = -smb +dcerpc endpoint servers = -unixinfo -rpcecho -spoolss -winreg -wkssvc -srvsvc +"; + + print "PROVISIONING PLUGIN S4 DC..."; + my $ret = $self->provision($prefix, + "domain controller", + "plugindc", + "PLUGINDOMAIN", + "plugin.samba.example.com", + "2008", + 30, + "locDCpass1", + undef, $extra_smbconf_options); + + return undef unless(defined $ret); + unless($self->add_wins_config("$prefix/private")) { + warn("Unable to add wins configuration"); + return undef; + } + + $ret->{DC_SERVER} = $ret->{SERVER}; + $ret->{DC_SERVER_IP} = $ret->{SERVER_IP}; + $ret->{DC_NETBIOSNAME} = $ret->{NETBIOSNAME}; + $ret->{DC_USERNAME} = $ret->{USERNAME}; + $ret->{DC_PASSWORD} = $ret->{PASSWORD}; + + return $ret; +} + sub teardown_env($$) { my ($self, $envvars) = @_; @@ -1236,7 +1372,7 @@ sub getlog_env($$) close(LOG); return "" if $out eq $title; - + return $out; } @@ -1250,6 +1386,9 @@ sub check_env($$) sub setup_env($$$) { my ($self, $envname, $path) = @_; + my $target3 = $self->{target3}; + + $ENV{ENVNAME} = $envname; if ($envname eq "dc") { return $self->setup_dc("$path/dc"); @@ -1269,64 +1408,29 @@ sub setup_env($$$) $self->setup_dc("$path/dc"); } return $self->setup_vampire_dc("$path/vampire_dc", $self->{vars}->{dc}); - } elsif ($envname eq "member") { + } elsif ($envname eq "subdom_dc") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); } - return $self->setup_member("$path/member", $self->{vars}->{dc}); + return $self->setup_subdom_dc("$path/subdom_dc", $self->{vars}->{dc}); + } elsif ($envname eq "s4member") { + if (not defined($self->{vars}->{dc})) { + $self->setup_dc("$path/dc"); + } + return $self->setup_member("$path/s4member", $self->{vars}->{dc}); } elsif ($envname eq "rodc") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); } return $self->setup_rodc("$path/rodc", $self->{vars}->{dc}); - } elsif ($envname eq "all") { + } elsif ($envname eq "s3member") { if (not defined($self->{vars}->{dc})) { $self->setup_dc("$path/dc"); } - my $ret = $self->setup_member("$path/member", $self->{vars}->{dc}); - if (not defined($self->{vars}->{rpc_proxy})) { - my $rpc_proxy_ret = $self->setup_rpc_proxy("$path/rpc_proxy", $self->{vars}->{dc}); - - $ret->{RPC_PROXY_SERVER} = $rpc_proxy_ret->{SERVER}; - $ret->{RPC_PROXY_SERVER_IP} = $rpc_proxy_ret->{SERVER_IP}; - $ret->{RPC_PROXY_NETBIOSNAME} = $rpc_proxy_ret->{NETBIOSNAME}; - $ret->{RPC_PROXY_NETBIOSALIAS} = $rpc_proxy_ret->{NETBIOSALIAS}; - $ret->{RPC_PROXY_USERNAME} = $rpc_proxy_ret->{USERNAME}; - $ret->{RPC_PROXY_PASSWORD} = $rpc_proxy_ret->{PASSWORD}; - } - if (not defined($self->{vars}->{fl2000dc})) { - my $fl2000dc_ret = $self->setup_fl2000dc("$path/fl2000dc", $self->{vars}->{dc}); - - $ret->{FL2000DC_SERVER} = $fl2000dc_ret->{SERVER}; - $ret->{FL2000DC_SERVER_IP} = $fl2000dc_ret->{SERVER_IP}; - $ret->{FL2000DC_NETBIOSNAME} = $fl2000dc_ret->{NETBIOSNAME}; - $ret->{FL2000DC_NETBIOSALIAS} = $fl2000dc_ret->{NETBIOSALIAS}; - $ret->{FL2000DC_USERNAME} = $fl2000dc_ret->{USERNAME}; - $ret->{FL2000DC_PASSWORD} = $fl2000dc_ret->{PASSWORD}; - } - if (not defined($self->{vars}->{fl2003dc})) { - my $fl2003dc_ret = $self->setup_fl2003dc("$path/fl2003dc", $self->{vars}->{dc}); - - $ret->{FL2003DC_SERVER} = $fl2003dc_ret->{SERVER}; - $ret->{FL2003DC_SERVER_IP} = $fl2003dc_ret->{SERVER_IP}; - $ret->{FL2003DC_NETBIOSNAME} = $fl2003dc_ret->{NETBIOSNAME}; - $ret->{FL2003DC_NETBIOSALIAS} = $fl2003dc_ret->{NETBIOSALIAS}; - $ret->{FL2003DC_USERNAME} = $fl2003dc_ret->{USERNAME}; - $ret->{FL2003DC_PASSWORD} = $fl2003dc_ret->{PASSWORD}; - } - if (not defined($self->{vars}->{fl2008r2dc})) { - my $fl2008r2dc_ret = $self->setup_fl2008r2dc("$path/fl2008r2dc", $self->{vars}->{dc}); - - $ret->{FL2008R2DC_SERVER} = $fl2008r2dc_ret->{SERVER}; - $ret->{FL2008R2DC_SERVER_IP} = $fl2008r2dc_ret->{SERVER_IP}; - $ret->{FL2008R2DC_NETBIOSNAME} = $fl2008r2dc_ret->{NETBIOSNAME}; - $ret->{FL2008R2DC_NETBIOSALIAS} = $fl2008r2dc_ret->{NETBIOSALIAS}; - $ret->{FL2008R2DC_USERNAME} = $fl2008r2dc_ret->{USERNAME}; - $ret->{FL2008R2DC_PASSWORD} = $fl2008r2dc_ret->{PASSWORD}; - } - return $ret; + return $target3->setup_admember("$path/s3member", $self->{vars}->{dc}, 29); + } elsif ($envname eq "plugin_s4_dc") { + return $self->setup_plugin_s4_dc("$path/plugin_s4_dc"); } else { - warn("Samba4 can't provide environment '$envname'"); return undef; } } @@ -1337,11 +1441,13 @@ sub setup_member($$$) my $env = $self->provision_member($path, $dc_vars); - $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500)); + if (defined $env) { + $self->check_or_start($env, "single"); - $self->wait_for_start($env); + $self->wait_for_start($env); - $self->{vars}->{member} = $env; + $self->{vars}->{member} = $env; + } return $env; } @@ -1352,12 +1458,13 @@ sub setup_rpc_proxy($$$) my $env = $self->provision_rpc_proxy($path, $dc_vars); - $self->check_or_start($env, ($ENV{SMBD_MAXTIME} or 7500)); - - $self->wait_for_start($env); + if (defined $env) { + $self->check_or_start($env, "single"); - $self->{vars}->{rpc_proxy} = $env; + $self->wait_for_start($env); + $self->{vars}->{rpc_proxy} = $env; + } return $env; } @@ -1366,14 +1473,13 @@ sub setup_dc($$) my ($self, $path) = @_; my $env = $self->provision_dc($path); + if (defined $env) { + $self->check_or_start($env, "standard"); - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); - - $self->wait_for_start($env); - - $self->{vars}->{dc} = $env; + $self->wait_for_start($env); + $self->{vars}->{dc} = $env; + } return $env; } @@ -1382,13 +1488,13 @@ sub setup_fl2000dc($$) my ($self, $path) = @_; my $env = $self->provision_fl2000dc($path); + if (defined $env) { + $self->check_or_start($env, "single"); - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->wait_for_start($env); - $self->wait_for_start($env); - - $self->{vars}->{fl2000dc} = $env; + $self->{vars}->{fl2000dc} = $env; + } return $env; } @@ -1399,13 +1505,13 @@ sub setup_fl2003dc($$) my $env = $self->provision_fl2003dc($path); - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + if (defined $env) { + $self->check_or_start($env, "single"); - $self->wait_for_start($env); - - $self->{vars}->{fl2003dc} = $env; + $self->wait_for_start($env); + $self->{vars}->{fl2003dc} = $env; + } return $env; } @@ -1415,12 +1521,13 @@ sub setup_fl2008r2dc($$) my $env = $self->provision_fl2008r2dc($path); - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + if (defined $env) { + $self->check_or_start($env, "single"); - $self->wait_for_start($env); + $self->wait_for_start($env); - $self->{vars}->{fl2008r2dc} = $env; + $self->{vars}->{fl2008r2dc} = $env; + } return $env; } @@ -1431,44 +1538,100 @@ sub setup_vampire_dc($$$) my $env = $self->provision_vampire_dc($path, $dc_vars); - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + if (defined $env) { + $self->check_or_start($env, "single"); + + $self->wait_for_start($env); + + $self->{vars}->{vampire_dc} = $env; + + # force replicated DC to update repsTo/repsFrom + # for vampired partitions + my $samba_tool = Samba::bindir_path($self, "samba-tool"); + my $cmd = ""; + $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; + $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; + $cmd .= " $samba_tool drs kcc $env->{DC_SERVER}"; + $cmd .= " $env->{CONFIGURATION}"; + $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; + unless (system($cmd) == 0) { + warn("Failed to exec kcc\n$cmd"); + return undef; + } - $self->wait_for_start($env); + # as 'vampired' dc may add data in its local replica + # we need to synchronize data between DCs + my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); + $cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; + $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; + $cmd .= " $samba_tool drs replicate $env->{DC_SERVER} $env->{VAMPIRE_DC_SERVER}"; + $cmd .= " $dc_vars->{CONFIGURATION}"; + $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; + # replicate Configuration NC + my $cmd_repl = "$cmd \"CN=Configuration,$base_dn\""; + unless(system($cmd_repl) == 0) { + warn("Failed to replicate\n$cmd_repl"); + return undef; + } + # replicate Default NC + $cmd_repl = "$cmd \"$base_dn\""; + unless(system($cmd_repl) == 0) { + warn("Failed to replicate\n$cmd_repl"); + return undef; + } + } - $self->{vars}->{vampire_dc} = $env; + return $env; +} - # force replicated DC to update repsTo/repsFrom - # for vampired partitions - my $net = $self->bindir_path("net"); - my $cmd = ""; - $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= " $net drs kcc $env->{DC_SERVER}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - unless (system($cmd) == 0) { - warn("Failed to exec kcc\n$cmd"); - return undef; - } +sub setup_subdom_dc($$$) +{ + my ($self, $path, $dc_vars) = @_; - # as 'vampired' dc may add data in its local replica - # we need to synchronize data between DCs - my $base_dn = "DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); - $cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; - $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; - $cmd .= " $net drs replicate $env->{DC_SERVER} $env->{VAMPIRE_DC_SERVER}"; - $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD}"; - # replicate Configuration NC - my $cmd_repl = "$cmd \"CN=Configuration,$base_dn\""; - unless(system($cmd_repl) == 0) { - warn("Failed to replicate\n$cmd_repl"); - return undef; - } - # replicate Default NC - $cmd_repl = "$cmd \"$base_dn\""; - unless(system($cmd_repl) == 0) { - warn("Failed to replicate\n$cmd_repl"); - return undef; + my $env = $self->provision_subdom_dc($path, $dc_vars); + + if (defined $env) { + $self->check_or_start($env, "single"); + + $self->wait_for_start($env); + + $self->{vars}->{subdom_dc} = $env; + + # force replicated DC to update repsTo/repsFrom + # for primary domain partitions + my $samba_tool = Samba::bindir_path($self, "samba-tool"); + my $cmd = ""; + $cmd .= "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; + $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; + $cmd .= " $samba_tool drs kcc $env->{DC_SERVER}"; + $cmd .= " $env->{CONFIGURATION}"; + $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD} --realm=$dc_vars->{DC_REALM}"; + unless (system($cmd) == 0) { + warn("Failed to exec kcc\n$cmd"); + return undef; + } + + # as 'subdomain' dc may add data in its local replica + # we need to synchronize data between DCs + my $base_dn = "DC=".join(",DC=", split(/\./, $env->{REALM})); + my $config_dn = "CN=Configuration,DC=".join(",DC=", split(/\./, $dc_vars->{REALM})); + $cmd = "SOCKET_WRAPPER_DEFAULT_IFACE=\"$env->{SOCKET_WRAPPER_DEFAULT_IFACE}\""; + $cmd .= " KRB5_CONFIG=\"$env->{KRB5_CONFIG}\""; + $cmd .= " $samba_tool drs replicate $env->{DC_SERVER} $env->{SUBDOM_DC_SERVER}"; + $cmd .= " $dc_vars->{CONFIGURATION}"; + $cmd .= " -U$dc_vars->{DC_USERNAME}\%$dc_vars->{DC_PASSWORD} --realm=$dc_vars->{DC_REALM}"; + # replicate Configuration NC + my $cmd_repl = "$cmd \"$config_dn\""; + unless(system($cmd_repl) == 0) { + warn("Failed to replicate\n$cmd_repl"); + return undef; + } + # replicate Default NC + $cmd_repl = "$cmd \"$base_dn\""; + unless(system($cmd_repl) == 0) { + warn("Failed to replicate\n$cmd_repl"); + return undef; + } } return $env; @@ -1484,8 +1647,7 @@ sub setup_rodc($$$) return undef; } - $self->check_or_start($env, - ($ENV{SMBD_MAXTIME} or 7500)); + $self->check_or_start($env, "single"); $self->wait_for_start($env); @@ -1494,4 +1656,24 @@ sub setup_rodc($$$) return $env; } +sub setup_plugin_s4_dc($$) +{ + my ($self, $path) = @_; + + my $env = $self->provision_plugin_s4_dc($path); + if (defined $env) { + $self->check_or_start($env, "single"); + + $self->wait_for_start($env); + + my $s3_part_env = $self->{target3}->setup_plugin_s4_dc($path, $env, 30); + if (not defined($s3_part_env)) { + return undef; + } + + $self->{vars}->{plugin_s4_dc} = $s3_part_env; + } + return $env; +} + 1;