From: Andrew Bartlett Date: Wed, 19 May 2021 01:57:21 +0000 (+1200) Subject: selftest: standardise and shorten winbind socket name X-Git-Tag: tevent-0.11.0~687 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=58b5513d5237c29489f0e8abb4cc02ccee7bd67a;p=thirdparty%2Fsamba.git 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 Reviewed-by: Douglas Bagnall Autobuild-User(master): Douglas Bagnall 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 f1d1482c292..675deaf3c5a 100755 --- 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 33f53fe68e2..710f46096c1 100755 --- 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";