Rev 11877: Make the actual domain join work by using a different netbios name than the the dc. in file:///home/jelmer/bzr.samba/SAMBA_4_0/

[Jelmer Vernooij]

At file:///home/jelmer/bzr.samba/SAMBA_4_0/

------------------------------------------------------------
revno: 11877
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: SAMBA_4_0
timestamp: Mon 2007-04-16 23:53:15 +0200
message:
  Make the actual domain join work by using a different netbios name than the 
the dc.
modified:
  source/script/tests/Samba4.pm  svn-v2:[EMAIL PROTECTED]
  source/script/tests/mksamba4server.pl svn-v2:[EMAIL PROTECTED]
  testprogs/blackbox/test_kinit.sh* svn-v2:[EMAIL PROTECTED]
=== modified file 'source/script/tests/Samba4.pm'
--- a/source/script/tests/Samba4.pm     2007-04-16 20:48:56 +0000
+++ b/source/script/tests/Samba4.pm     2007-04-16 21:53:15 +0000
@@ -93,7 +93,7 @@
                if (defined($max_time)) {
                        $optarg = "--maximum-runtime=$max_time ";
                }
-               my $ret = system("$valgrind $self->{bindir}/smbd $optarg -s 
$env_vars->{CONFFILE} -M single -i --leak-report-full");
+               my $ret = system("$valgrind $self->{bindir}/smbd $optarg 
$env_vars->{CONFIGURATION} -M single -i --leak-report-full");
                if ($? == -1) {
                        print "Unable to start smbd: $ret: $!\n";
                        exit 1;
@@ -140,14 +140,14 @@
        my ($self, $prefix, $dcvars) = @_;
        my %ret = ();
        print "PROVISIONING...";
-       open(IN, "$RealBin/mksamba4server.pl --netbiosname=nbmember 
--server-role=\"member server\" $prefix|") or die("Unable to setup");
+       open(IN, "$RealBin/mksamba4server.pl --netbios-name=nbmember 
--server-role=\"member server\" $prefix|") or die("Unable to setup");
        while (<IN>) {
                die ("Error parsing `$_'") unless (/^([A-Z0-9a-z_]+)=(.*)$/);
                $ret{$1} = $2;
        }
        close(IN);
 
-       system("$self->{bindir}/net join $ret{CONFIGURATION} $dcvars->{DOMAIN} 
member -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}") or die("Join failed");
+       system("$self->{bindir}/net join $ret{CONFIGURATION} $dcvars->{DOMAIN} 
member -U$dcvars->{USERNAME}\%$dcvars->{PASSWORD}") == 0 or die("Join failed");
 
        $ret{SMBD_TEST_FIFO} = "$prefix/smbd_test.fifo";
        $ret{SMBD_TEST_LOG} = "$prefix/smbd_test.log";

=== modified file 'source/script/tests/mksamba4server.pl'
--- a/source/script/tests/mksamba4server.pl     2007-04-16 20:48:56 +0000
+++ b/source/script/tests/mksamba4server.pl     2007-04-16 21:53:15 +0000
@@ -267,7 +267,9 @@
 
 (system("$srcdir/bin/smbscript $srcdir/setup/provision " .  join(' ', 
@provision_options) . ">&2") == 0) or die("Unable to provision");
 
-my $ldap_uri="ldapi://" . `echo $ldapdir/ldapi | sed 's|/|%2F|g'`;
+my $ldap_uri= "$ldapdir/ldapi";
+$ldap_uri =~ s|/|%2F|g;
+$ldap_uri = "ldapi://$ldap_uri";
 my $provision_aci = "";
 
 if (not defined($opt_ldap)) {
@@ -293,9 +295,8 @@
 close(LDIF);
 
 system("$srcdir/bin/ldbadd -H $privatedir/wins_config.ldb < 
$privatedir/wins_config.ldif >/dev/null") == 0 or die("Unable to add wins 
configuration");
-;
+
 print "KRB5_CONFIG=$krb5_config\n";
-print "SLAPD_CONF=$slapd_conf\n";
 print "PIDDIR=$piddir\n";
 print "SERVER=$server\n";
 print "NETBIOSNAME=$netbiosname\n";

=== modified file 'testprogs/blackbox/test_kinit.sh' (properties changed)