summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-12-07 07:28:43 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:10 -0500
commit89f5d66dfeb02ad626ad21c4c4c7800560f83676 (patch)
tree7a756c58e7d8cc3f899ce77444d43c3817ab7128
parent3edfa552a28e002dda3baa7c7117bbbe8dfccae7 (diff)
downloadsamba-89f5d66dfeb02ad626ad21c4c4c7800560f83676.tar.gz
samba-89f5d66dfeb02ad626ad21c4c4c7800560f83676.tar.bz2
samba-89f5d66dfeb02ad626ad21c4c4c7800560f83676.zip
r12114: - smb2_keepalive() acts on the smb2_transport
- smb2_logoff() acts on the smb2_session metze (This used to be commit ae1ca2bb4affefff1026c03f0765faf28c2b316b)
-rw-r--r--source4/libcli/smb2/keepalive.c8
-rw-r--r--source4/libcli/smb2/logoff.c10
-rw-r--r--source4/torture/smb2/connect.c6
3 files changed, 13 insertions, 11 deletions
diff --git a/source4/libcli/smb2/keepalive.c b/source4/libcli/smb2/keepalive.c
index 64ed847757..4017623a61 100644
--- a/source4/libcli/smb2/keepalive.c
+++ b/source4/libcli/smb2/keepalive.c
@@ -28,11 +28,11 @@
/*
send a keepalive request
*/
-struct smb2_request *smb2_keepalive_send(struct smb2_tree *tree)
+struct smb2_request *smb2_keepalive_send(struct smb2_transport *transport)
{
struct smb2_request *req;
- req = smb2_request_init_tree(tree, SMB2_OP_KEEPALIVE, 0x04, 0);
+ req = smb2_request_init(transport, SMB2_OP_KEEPALIVE, 0x04, 0);
if (req == NULL) return NULL;
SSVAL(req->out.body, 0x02, 0);
@@ -60,8 +60,8 @@ NTSTATUS smb2_keepalive_recv(struct smb2_request *req)
/*
sync keepalive request
*/
-NTSTATUS smb2_keepalive(struct smb2_tree *tree)
+NTSTATUS smb2_keepalive(struct smb2_transport *transport)
{
- struct smb2_request *req = smb2_keepalive_send(tree);
+ struct smb2_request *req = smb2_keepalive_send(transport);
return smb2_keepalive_recv(req);
}
diff --git a/source4/libcli/smb2/logoff.c b/source4/libcli/smb2/logoff.c
index a73c7ee92e..febe0d6b45 100644
--- a/source4/libcli/smb2/logoff.c
+++ b/source4/libcli/smb2/logoff.c
@@ -28,13 +28,15 @@
/*
send a logoff request
*/
-struct smb2_request *smb2_logoff_send(struct smb2_tree *tree)
+struct smb2_request *smb2_logoff_send(struct smb2_session *session)
{
struct smb2_request *req;
- req = smb2_request_init_tree(tree, SMB2_OP_LOGOFF, 0x04, 0);
+ req = smb2_request_init(session->transport, SMB2_OP_LOGOFF, 0x04, 0);
if (req == NULL) return NULL;
+ SBVAL(req->out.hdr, SMB2_HDR_UID, session->uid);
+
SSVAL(req->out.body, 0x02, 0);
smb2_transport_send(req);
@@ -60,8 +62,8 @@ NTSTATUS smb2_logoff_recv(struct smb2_request *req)
/*
sync logoff request
*/
-NTSTATUS smb2_logoff(struct smb2_tree *tree)
+NTSTATUS smb2_logoff(struct smb2_session *session)
{
- struct smb2_request *req = smb2_logoff_send(tree);
+ struct smb2_request *req = smb2_logoff_send(session);
return smb2_logoff_recv(req);
}
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index dde2ace4b2..fe5febdf07 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -216,19 +216,19 @@ BOOL torture_smb2_connect(void)
return False;
}
- status = smb2_logoff(tree);
+ status = smb2_logoff(tree->session);
if (!NT_STATUS_IS_OK(status)) {
printf("Logoff failed - %s\n", nt_errstr(status));
return False;
}
- status = smb2_logoff(tree);
+ status = smb2_logoff(tree->session);
if (!NT_STATUS_EQUAL(status, NT_STATUS_USER_SESSION_DELETED)) {
printf("Logoff should have disabled session - %s\n", nt_errstr(status));
return False;
}
- status = smb2_keepalive(tree);
+ status = smb2_keepalive(tree->session->transport);
if (!NT_STATUS_IS_OK(status)) {
printf("keepalive failed? - %s\n", nt_errstr(status));
return False;