summaryrefslogtreecommitdiffstats
path: root/source4/smb_server
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-10 14:31:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:56:55 -0500
commit86497db6113c4ec3210d671c3fcf957d1026098c (patch)
treeea7aaa040264907802688b8154873603f4f4635c /source4/smb_server
parentb86c1b744b48a2b664c9075335eb48098e4462fd (diff)
downloadsamba-86497db6113c4ec3210d671c3fcf957d1026098c.tar.gz
samba-86497db6113c4ec3210d671c3fcf957d1026098c.tar.xz
samba-86497db6113c4ec3210d671c3fcf957d1026098c.zip
r14157: - pass a struct ntvfs_request to the ntvfs layer
(for now we just do #define ntvfs_request smbsrv_request, but it's the first step...) - rename ntvfs_openfile() -> ntvfs_open() - fix the talloc hierachie in some places in the ntvfs_map_*() code metze (This used to be commit ed9ed1f48f602354810937c0b0de850b44322191)
Diffstat (limited to 'source4/smb_server')
-rw-r--r--source4/smb_server/smb/nttrans.c2
-rw-r--r--source4/smb_server/smb/reply.c12
-rw-r--r--source4/smb_server/smb/trans2.c2
-rw-r--r--source4/smb_server/smb_server.h2
-rw-r--r--source4/smb_server/tcon.c2
5 files changed, 10 insertions, 10 deletions
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 3d898ba1a70..b105932386d 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -187,7 +187,7 @@ static NTSTATUS nttrans_create(struct smbsrv_request *req,
op->send_fn = nttrans_create_send;
op->op_info = io;
- return ntvfs_openfile(req, io);
+ return ntvfs_open(req, io);
}
diff --git a/source4/smb_server/smb/reply.c b/source4/smb_server/smb/reply.c
index db4580bf5a5..93697afd4ae 100644
--- a/source4/smb_server/smb/reply.c
+++ b/source4/smb_server/smb/reply.c
@@ -446,7 +446,7 @@ void smbsrv_reply_open(struct smbsrv_request *req)
req->async_states->private_data = oi;
/* call backend */
- req->async_states->status = ntvfs_openfile(req, oi);
+ req->async_states->status = ntvfs_open(req, oi);
REQ_ASYNC_TAIL;
}
@@ -524,7 +524,7 @@ void smbsrv_reply_open_and_X(struct smbsrv_request *req)
req->async_states->private_data = oi;
/* call the backend */
- req->async_states->status = ntvfs_openfile(req, oi);
+ req->async_states->status = ntvfs_open(req, oi);
REQ_ASYNC_TAIL;
}
@@ -579,7 +579,7 @@ void smbsrv_reply_mknew(struct smbsrv_request *req)
req->async_states->private_data = oi;
/* call the backend */
- req->async_states->status = ntvfs_openfile(req, oi);
+ req->async_states->status = ntvfs_open(req, oi);
REQ_ASYNC_TAIL;
}
@@ -633,7 +633,7 @@ void smbsrv_reply_ctemp(struct smbsrv_request *req)
req->async_states->private_data = oi;
/* call the backend */
- req->async_states->status = ntvfs_openfile(req, oi);
+ req->async_states->status = ntvfs_open(req, oi);
REQ_ASYNC_TAIL;
}
@@ -1442,7 +1442,7 @@ void smbsrv_reply_printopen(struct smbsrv_request *req)
req->async_states->private_data = oi;
/* call backend */
- req->async_states->status = ntvfs_openfile(req, oi);
+ req->async_states->status = ntvfs_open(req, oi);
REQ_ASYNC_TAIL;
}
@@ -2328,7 +2328,7 @@ void smbsrv_reply_ntcreate_and_X(struct smbsrv_request *req)
req->async_states->private_data = io;
/* call the backend */
- req->async_states->status = ntvfs_openfile(req, io);
+ req->async_states->status = ntvfs_open(req, io);
REQ_ASYNC_TAIL;
}
diff --git a/source4/smb_server/smb/trans2.c b/source4/smb_server/smb/trans2.c
index be149610823..ed53ce4daf6 100644
--- a/source4/smb_server/smb/trans2.c
+++ b/source4/smb_server/smb/trans2.c
@@ -452,7 +452,7 @@ static NTSTATUS trans2_open(struct smbsrv_request *req, struct smb_trans2 *trans
return status;
}
- status = ntvfs_openfile(req, io);
+ status = ntvfs_open(req, io);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h
index 5ba17998684..803de3e711a 100644
--- a/source4/smb_server/smb_server.h
+++ b/source4/smb_server/smb_server.h
@@ -141,7 +141,7 @@ struct smbsrv_tcon {
functions */
struct smbsrv_request {
/* the smbsrv_connection needs a list of requests queued for send */
- struct smbsrv_request *next, *prev;
+ struct smbsrv_request_foo *next, *prev;
/* the server_context contains all context specific to this SMB socket */
struct smbsrv_connection *smb_conn;
diff --git a/source4/smb_server/tcon.c b/source4/smb_server/tcon.c
index e0def0ab3f6..90fe20a4c8b 100644
--- a/source4/smb_server/tcon.c
+++ b/source4/smb_server/tcon.c
@@ -102,7 +102,7 @@ static int smbsrv_tcon_destructor(void *ptr)
/* tell the ntvfs backend that we are disconnecting */
if (tcon->ntvfs_ctx) {
- ntvfs_disconnect(tcon);
+ ntvfs_disconnect(tcon->ntvfs_ctx);
}
if (tcon->smb2.session) {