selftest/Samba4: correctly upper case the netbiosname variable
authorStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 16:50:51 +0000 (18:50 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 24 Jun 2011 17:09:28 +0000 (19:09 +0200)
metze

selftest/target/Samba4.pm

index b76fd98abd6407807dd2374969e013b138e76a36..2a3fe65e74f387848d51333f450cdf9a601ed08e 100644 (file)
@@ -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);