3 files changed, 54 insertions, 3 deletions
diff --git a/source4/torture/winbind/config.mk b/source4/torture/winbind/config.mk
index d7351144b7..b64b0647fc 100644
--- a/source4/torture/winbind/config.mk
+++ b/source4/torture/winbind/config.mk
@@ -7,8 +7,9 @@ INIT_FUNCTION = torture_winbind_init
 PRIVATE_PROTO_HEADER = \
 		proto.h
 OBJ_FILES = \
-		winbind.o
+		winbind.o \
+		struct_based.o
 PRIVATE_DEPENDENCIES = \
-		POPT_CREDENTIALS
+		LIBWINBIND-CLIENT
 # End SUBSYSTEM TORTURE_WINBIND
 #################################
diff --git a/source4/torture/winbind/struct_based.c b/source4/torture/winbind/struct_based.c
new file mode 100644
index 0000000000..3e17fe6358
--- /dev/null
+++ b/source4/torture/winbind/struct_based.c
@@ -0,0 +1,47 @@
+/*
+   Unix SMB/CIFS implementation.
+   SMB torture tester - winbind struct based protocol
+   Copyright (C) Stefan Metzmacher 2007
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "torture/winbind/proto.h"
+#include "nsswitch/winbind_client.h"
+
+static bool torture_winbind_struct_ping(struct torture_context *torture)
+{
+	NSS_STATUS result;
+
+	torture_comment(torture, "Testing WINBINDD_PING (struct based protocol)\n");
+
+	result = winbindd_request_response(WINBINDD_PING, NULL, NULL);
+	torture_assert_int_equal(torture,result,NSS_STATUS_SUCCESS,
+				 "WINBINDD_PING (struct based protocol)");
+
+	return true;
+}
+
+struct torture_suite *torture_winbind_struct_init(void)
+{
+	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "STRUCT");
+
+	torture_suite_add_simple_test(suite, "PING", torture_winbind_struct_ping);
+
+	suite->description = talloc_strdup(suite, "WINBIND - struct based protocol tests");
+
+	return suite;
+}
diff --git a/source4/torture/winbind/winbind.c b/source4/torture/winbind/winbind.c
index 371f52beb5..e283602337 100644
--- a/source4/torture/winbind/winbind.c
+++ b/source4/torture/winbind/winbind.c
@@ -19,12 +19,15 @@
 
 #include "includes.h"
 #include "torture/torture.h"
+#include "torture/winbind/proto.h"
 
 NTSTATUS torture_winbind_init(void)
 {
 	struct torture_suite *suite = torture_suite_create(talloc_autofree_context(), "WINBIND");
 
-	suite->description = talloc_strdup(suite, "WINBIND-protocol tests");
+	torture_suite_add_suite(suite, torture_winbind_struct_init());
+
+	suite->description = talloc_strdup(suite, "WINBIND tests");
 
 	torture_register_suite(suite);