From ab4d635b92b116b02b88843b4ec4f5b7517bab1a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 26 Sep 2005 11:47:55 +0000 Subject: r10504: - seperate implementation specific stuff, from the generic composite stuff. - don't use SMBCLI_REQUEST_* state's in the genreic composite stuff - move monitor_fn to libnet. NOTE: I have maybe found some bugs, in code that is dirrectly in DONE or ERROR state in the _send() function. I haven't fixed this bugs in this commit! We may need some composite_trigger_*() functions or so. And maybe some other generic helper functions... metze (This used to be commit 4527815a0a9b96e460f301cb1f0c0b3964c166fc) --- source4/torture/libnet/domain.c | 1 - source4/torture/libnet/libnet_lookup.c | 1 - source4/torture/libnet/libnet_rpc.c | 1 - source4/torture/libnet/libnet_user.c | 1 - source4/torture/libnet/userinfo.c | 1 - source4/torture/libnet/userman.c | 3 +-- 6 files changed, 1 insertion(+), 7 deletions(-) (limited to 'source4/torture/libnet') diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c index 7edbd5742d..98c44cd942 100644 --- a/source4/torture/libnet/domain.c +++ b/source4/torture/libnet/domain.c @@ -22,7 +22,6 @@ #include "includes.h" #include "librpc/gen_ndr/ndr_samr.h" #include "libnet/composite.h" -#include "libcli/composite/monitor.h" static BOOL test_domainopen(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct lsa_String *domname, diff --git a/source4/torture/libnet/libnet_lookup.c b/source4/torture/libnet/libnet_lookup.c index 320b3c11cc..b0cdc8c93e 100644 --- a/source4/torture/libnet/libnet_lookup.c +++ b/source4/torture/libnet/libnet_lookup.c @@ -23,7 +23,6 @@ #include "lib/cmdline/popt_common.h" #include "libnet/libnet.h" #include "libnet/composite.h" -#include "libcli/composite/monitor.h" #include "librpc/gen_ndr/ndr_nbt.h" diff --git a/source4/torture/libnet/libnet_rpc.c b/source4/torture/libnet/libnet_rpc.c index ee51ac15a2..4cd04ecb42 100644 --- a/source4/torture/libnet/libnet_rpc.c +++ b/source4/torture/libnet/libnet_rpc.c @@ -23,7 +23,6 @@ #include "lib/cmdline/popt_common.h" #include "libnet/libnet.h" #include "libnet/composite.h" -#include "libcli/composite/monitor.h" BOOL test_lsa_connect(struct libnet_context *ctx) diff --git a/source4/torture/libnet/libnet_user.c b/source4/torture/libnet/libnet_user.c index 4db0028481..60c8bce935 100644 --- a/source4/torture/libnet/libnet_user.c +++ b/source4/torture/libnet/libnet_user.c @@ -24,7 +24,6 @@ #include "lib/cmdline/popt_common.h" #include "libnet/libnet.h" #include "libnet/composite.h" -#include "libcli/composite/monitor.h" #define TEST_USERNAME "libnetusertest" diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c index aa1e64301a..63724bc8b1 100644 --- a/source4/torture/libnet/userinfo.c +++ b/source4/torture/libnet/userinfo.c @@ -23,7 +23,6 @@ #include "librpc/gen_ndr/ndr_samr.h" #include "libnet/composite.h" #include "libnet/userinfo.h" -#include "libcli/composite/monitor.h" #define TEST_USERNAME "libnetuserinfotest" diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c index 8ddd956608..fc2a32c913 100644 --- a/source4/torture/libnet/userman.c +++ b/source4/torture/libnet/userman.c @@ -23,7 +23,6 @@ #include "librpc/gen_ndr/ndr_samr.h" #include "libnet/composite.h" #include "libnet/userman.h" -#include "libcli/composite/monitor.h" #define TEST_USERNAME "libnetusermantest" @@ -412,7 +411,7 @@ BOOL torture_usermod(void) struct dcerpc_pipe *p; struct policy_handle h; struct lsa_String domain_name; - char *name = TEST_USERNAME; + const char *name = TEST_USERNAME; TALLOC_CTX *mem_ctx; BOOL ret = True; int i; -- cgit