[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha5-500-g2d41035
Andrew Bartlett
abartlet at samba.org
Thu Sep 11 01:50:16 GMT 2008
The branch, v4-0-test has been updated
via 2d4103518ab8a7286e65347b8b9b0ccb660e69f6 (commit)
from 7cd0977a28e9973ff71e9e0146fef6e6771a72b5 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 2d4103518ab8a7286e65347b8b9b0ccb660e69f6
Author: Andrew Bartlett <abartlet at samba.org>
Date: Thu Sep 11 11:49:24 2008 +1000
Fix failures in the winbind struct-based test.
Don't try to pass the 'privileged' socket directory around for expected value testing - it is just too hard...
A better test (once we unify the winbind protocol with Samba3) would
be a operation to see if you are on the priv pipe, and that will give
acutal end-to-end testing.
Andrew Bartlett
-----------------------------------------------------------------------
Summary of changes:
source/nsswitch/winbind_struct_protocol.h | 1 -
source/selftest/samba4_tests.sh | 1 -
source/selftest/target/Samba4.pm | 2 --
source/torture/winbind/struct_based.c | 11 -----------
4 files changed, 0 insertions(+), 15 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/nsswitch/winbind_struct_protocol.h b/source/nsswitch/winbind_struct_protocol.h
index 33797e2..fba4523 100644
--- a/source/nsswitch/winbind_struct_protocol.h
+++ b/source/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/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 82c57de..6f6ffbb 100755
--- a/source/selftest/samba4_tests.sh
+++ b/source/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/source/selftest/target/Samba4.pm b/source/selftest/target/Samba4.pm
index 896b013..8835f69 100644
--- a/source/selftest/target/Samba4.pm
+++ b/source/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/source/torture/winbind/struct_based.c b/source/torture/winbind/struct_based.c
index 31c5b8c..c27ab24 100644
--- a/source/torture/winbind/struct_based.c
+++ b/source/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;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list