diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-06-24 18:50:51 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-06-24 19:09:28 +0200 |
| commit | a7d2492cf7a398d7577863151fa823c62e8469b0 (patch) | |
| tree | 2afa5f7cd3a78886c536b2901ec83f2b67d46940 | |
| parent | ad45072aaf91a412df8fa1c7a7cc73891b370675 (diff) | |
| download | samba-a7d2492cf7a398d7577863151fa823c62e8469b0.tar.gz samba-a7d2492cf7a398d7577863151fa823c62e8469b0.tar.bz2 samba-a7d2492cf7a398d7577863151fa823c62e8469b0.zip | |
selftest/Samba4: correctly upper case the netbiosname variable
metze
| -rw-r--r-- | selftest/target/Samba4.pm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index b76fd98abd..2a3fe65e74 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -456,10 +456,11 @@ EOF sub provision_raw_prepare($$$$$$$$$$) { - my ($self, $prefix, $server_role, $netbiosname, + my ($self, $prefix, $server_role, $hostname, $domain, $realm, $functional_level, $swiface, $password, $kdc_ipv4) = @_; my $ctx; + my $netbiosname = uc($hostname); unless(-d $prefix or mkdir($prefix, 0777)) { warn("Unable to create $prefix"); @@ -480,6 +481,7 @@ sub provision_raw_prepare($$$$$$$$$$) $ctx->{dns_host_file} = "$ENV{SELFTEST_PREFIX}/dns_host_file"; $ctx->{server_role} = $server_role; + $ctx->{hostname} = $hostname; $ctx->{netbiosname} = $netbiosname; $ctx->{swiface} = $swiface; $ctx->{password} = $password; @@ -548,7 +550,7 @@ sub provision_raw_prepare($$$$$$$$$$) } 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}"); @@ -672,7 +674,7 @@ 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}, DOMAIN => $ctx->{domain}, @@ -715,12 +717,12 @@ sub provision_raw_step2($$$) sub provision($$$$$$$$$) { - my ($self, $prefix, $server_role, $netbiosname, + 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, + $hostname, $domain, $realm, $functional_level, $swiface, $password, $kdc_ipv4); |