selftest: standardise and shorten winbind socket name

The full path to the winbindd socket must fit within a struct sockaddr_un and this helps us work
where this is quite deep on the server.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): Douglas Bagnall <dbagnall@samba.org>
Autobuild-Date(master): Wed Jun  2 04:46:39 UTC 2021 on sn-devel-184

diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm
index f1d1482c292de48ce28597ad55e6f396baf25a89..675deaf3c5aabe4336962506b9b5fd11b17901af 100755 (executable)
--- a/selftest/target/Samba3.pm
+++ b/selftest/target/Samba3.pm
@@ -2254,7 +2254,7 @@ sub provision($$)
        push(@dirs,$local_symlinks_shrdir);
 
        # this gets autocreated by winbindd
-       my $wbsockdir="$prefix_abs/winbindd";
+       my $wbsockdir="$prefix_abs/wbsock";
 
        my $nmbdsockdir="$prefix_abs/nmbd";
        unlink($nmbdsockdir);

diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 33f53fe68e212844856a5b1f053781755008eb13..710f46096c129d10d3de1d5257b65786a90ddea0 100755 (executable)
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -599,7 +599,7 @@ sub provision_raw_prepare($$$$$$$$$$$$$$)
        $ctx->{logdir} = "$prefix_abs/logs";
        $ctx->{statedir} = "$prefix_abs/statedir";
        $ctx->{cachedir} = "$prefix_abs/cachedir";
-       $ctx->{winbindd_socket_dir} = "$prefix_abs/winbindd_socket";
+       $ctx->{winbindd_socket_dir} = "$prefix_abs/wbsock";
        $ctx->{ntp_signd_socket_dir} = "$prefix_abs/ntp_signd_socket";
        $ctx->{nsswrap_passwd} = "$ctx->{etcdir}/passwd";
        $ctx->{nsswrap_group} = "$ctx->{etcdir}/group";