diff options
| -rw-r--r-- | source4/nsswitch/winbind_struct_protocol.h | 1 | ||||
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 1 | ||||
| -rw-r--r-- | source4/selftest/target/Samba4.pm | 2 | ||||
| -rw-r--r-- | source4/torture/winbind/struct_based.c | 11 |
4 files changed, 0 insertions, 15 deletions
diff --git a/source4/nsswitch/winbind_struct_protocol.h b/source4/nsswitch/winbind_struct_protocol.h index 33797e2254..fba45230a9 100644 --- a/source4/nsswitch/winbind_struct_protocol.h +++ b/source4/nsswitch/winbind_struct_protocol.h @@ -34,7 +34,6 @@ */ #define WINBINDD_SOCKET_DIR_ENVVAR "WINBINDD_SOCKET_DIR" -#define WINBINDD_PRIV_SOCKET_SUBDIR "winbindd_privileged" /* name of subdirectory of lp_lockdir() to hold the 'privileged' pipe */ #define WINBINDD_DOMAIN_ENV "WINBINDD_DOMAIN" /* Environment variables */ #define WINBINDD_DONT_ENV "_NO_WINBINDD" #define WINBINDD_LOCATOR_KDC_ADDRESS "WINBINDD_LOCATOR_KDC_ADDRESS" diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index 82c57de29a..6f6ffbba60 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -308,7 +308,6 @@ done WB_OPTS="--option=\"torture:strict mode=no\"" WB_OPTS="${WB_OPTS} --option=\"torture:timelimit=1\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd separator=/\"" -WB_OPTS="${WB_OPTS} --option=\"torture:winbindd private pipe dir=\$WINBINDD_PRIV_PIPE_DIR\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd netbios name=\$SERVER\"" WB_OPTS="${WB_OPTS} --option=\"torture:winbindd netbios domain=\$DOMAIN\"" diff --git a/source4/selftest/target/Samba4.pm b/source4/selftest/target/Samba4.pm index 896b013105..8835f69c6c 100644 --- a/source4/selftest/target/Samba4.pm +++ b/source4/selftest/target/Samba4.pm @@ -523,7 +523,6 @@ sub provision($$$$$$) my $winbindd_socket_dir = "$prefix_abs/winbindd_socket"; my $winbindd_privileged_socket_dir = "$prefix_abs/winbindd_privileged_socket"; my $ntp_signd_socket_dir = "$prefix_abs/ntp_signd_socket"; - my $winbindd_priv_pipe_dir = "$privatedir/smbd.tmp/winbind_pipe"; my $nsswrap_passwd = "$etcdir/passwd"; my $nsswrap_group = "$etcdir/group"; @@ -739,7 +738,6 @@ nogroup:x:65534:nobody PASSWORD => $password, LDAPDIR => $ldapdir, WINBINDD_SOCKET_DIR => $winbindd_socket_dir, - WINBINDD_PRIV_PIPE_DIR => $winbindd_priv_pipe_dir, NCALRPCDIR => $ncalrpcdir, LOCKDIR => $lockdir, CONFIGURATION => $configuration, diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c index 31c5b8cf96..c27ab24a4d 100644 --- a/source4/torture/winbind/struct_based.c +++ b/source4/torture/winbind/struct_based.c @@ -140,8 +140,6 @@ static bool torture_winbind_struct_info(struct torture_context *torture) static bool torture_winbind_struct_priv_pipe_dir(struct torture_context *torture) { struct winbindd_response rep; - const char *default_dir; - const char *expected_dir; const char *got_dir; ZERO_STRUCT(rep); @@ -154,15 +152,6 @@ static bool torture_winbind_struct_priv_pipe_dir(struct torture_context *torture torture_assert(torture, got_dir, "NULL WINBINDD_PRIV_PIPE_DIR\n"); - default_dir = lock_path(torture, torture->lp_ctx, - WINBINDD_PRIV_SOCKET_SUBDIR); - expected_dir = torture_setting_string(torture, - "winbindd private pipe dir", - default_dir); - - torture_assert_str_equal(torture, got_dir, expected_dir, - "WINBINDD_PRIV_PIPE_DIR doesn't match"); - SAFE_FREE(rep.extra_data.data); return true; } |