Revert "HACK selftest/target/Samba.pm only ipv6 nameservers"
authorStefan Metzmacher <metze@samba.org>
Thu, 12 Mar 2020 11:21:46 +0000 (12:21 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 5 Jul 2023 19:43:35 +0000 (21:43 +0200)
This reverts commit d04ae5d92238e44435cc5d3c7a454ecaa074c487.

selftest/target/Samba.pm

index 1e75efbca4c3bc8874ef6e4cbcb04be08be53fab..334665a6ff2c0b2ac070c9003c9c2cb1542b5a58 100644 (file)
@@ -535,8 +535,8 @@ sub mk_resolv_conf($$)
                return undef;
        }
 
+       print RESOLV_CONF "nameserver $ctx->{dns_ipv4}\n";
        print RESOLV_CONF "nameserver $ctx->{dns_ipv6}\n";
-       #print RESOLV_CONF "nameserver $ctx->{dns_ipv4}\n";
        close(RESOLV_CONF);
 }
 
@@ -570,7 +570,7 @@ sub realm_to_ip_mappings
        # realm and value is the IP address
        foreach my $realm (sort(keys %realm_to_pdc_mapping)) {
                my $pdc = $realm_to_pdc_mapping{$realm};
-               my $ipaddr = get_ipv6_addr($pdc);
+               my $ipaddr = get_ipv4_addr($pdc);
                push(@mapping, "$realm=$ipaddr");
        }
        # return the mapping as a single comma-separated string