From 7cbc768376ed0a839afca64aeea99cd53d0fbc6f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 16 Jan 2005 11:15:08 +0000 Subject: r4777: added a smb_composite_sesssetup() async composite function. This encapsulates all the different session setup methods, including the multi-pass spnego code. I have hooked this into all the places that previously used the RAW_SESSSETUP_GENERIC method, and have removed the old RAW_SESSSETUP_GENERIC code from clisession.c and clitree.c. A nice side effect is that these two modules are now very simple again, back to being "raw" session setup handling, which was what was originally intended. I have also used this to replace the session setup code in the smb_composite_connect() code, and used that to build a very simple replacement for smbcli_tree_full_connection(). As a result, smbclient, smbtorture and all our other SMB connection code now goes via these composite async functions. That should give them a good workout! (This used to be commit 080d0518bc7d6fd4bc3ef783e7d4d2e3275d0799) --- source4/torture/rpc/xplogin.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source4/torture/rpc/xplogin.c') diff --git a/source4/torture/rpc/xplogin.c b/source4/torture/rpc/xplogin.c index d8a8a4e2e9..6dcd456fdb 100644 --- a/source4/torture/rpc/xplogin.c +++ b/source4/torture/rpc/xplogin.c @@ -26,6 +26,7 @@ #include "librpc/gen_ndr/ndr_samr.h" #include "librpc/gen_ndr/ndr_netlogon.h" #include "librpc/gen_ndr/ndr_srvsvc.h" +#include "libcli/composite/composite.h" static int destroy_transport(void *ptr) { @@ -106,7 +107,7 @@ static NTSTATUS anon_ipc(struct smbcli_transport *transport, { struct smbcli_tree *tree; struct smbcli_session *session; - union smb_sesssetup setup; + struct smb_composite_sesssetup setup; union smb_tcon tcon; TALLOC_CTX *mem_ctx; NTSTATUS status; @@ -122,22 +123,21 @@ static NTSTATUS anon_ipc(struct smbcli_transport *transport, } /* prepare a session setup to establish a security context */ - setup.generic.level = RAW_SESSSETUP_GENERIC; - setup.generic.in.sesskey = transport->negotiate.sesskey; - setup.generic.in.capabilities = transport->negotiate.capabilities; - setup.generic.in.password = NULL; - setup.generic.in.user = ""; - setup.generic.in.domain = ""; - setup.generic.in.capabilities &= ~CAP_EXTENDED_SECURITY; - - status = smb_raw_session_setup(session, mem_ctx, &setup); + setup.in.sesskey = transport->negotiate.sesskey; + setup.in.capabilities = transport->negotiate.capabilities; + setup.in.password = NULL; + setup.in.user = ""; + setup.in.domain = ""; + setup.in.capabilities &= ~CAP_EXTENDED_SECURITY; + + status = smb_composite_sesssetup(session, &setup); if (!NT_STATUS_IS_OK(status)) { talloc_free(session); talloc_free(mem_ctx); return NT_STATUS_UNSUCCESSFUL; } - session->vuid = setup.generic.out.vuid; + session->vuid = setup.out.vuid; talloc_set_destructor(session, destroy_session); -- cgit