summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-06-28 07:41:15 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:56:48 -0500
commitd4ae6ae74d712b74800e360590052d318d2fd101 (patch)
tree501cd87429114ba59612ffa9633117a5f40fc83c /source4/ntvfs
parentf18fa1dfdbd1ca2d721d146522c7efdfae638e7f (diff)
downloadsamba-d4ae6ae74d712b74800e360590052d318d2fd101.tar.gz
samba-d4ae6ae74d712b74800e360590052d318d2fd101.tar.bz2
samba-d4ae6ae74d712b74800e360590052d318d2fd101.zip
r1277: rename struct server_context to smbsrv_ontext
because I need server_context fot the generic server infastructure metze (This used to be commit 0712f9f30797e65362c99423c0cf158a2f539000)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/cifs/vfs_cifs.c8
-rw-r--r--source4/ntvfs/ipc/vfs_ipc.c2
-rw-r--r--source4/ntvfs/ntvfs_generic.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index 9e8768ae22..0c00beecbb 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -51,8 +51,8 @@ struct async_info {
static void idle_func(struct cli_transport *transport, void *p_private)
{
struct cvfs_private *private = p_private;
- if (socket_pending(private->conn->smb->socket.fd)) {
- smbd_process_async(private->conn->smb);
+ if (socket_pending(private->conn->smb_ctx->socket.fd)) {
+ smbd_process_async(private->conn->smb_ctx);
}
}
@@ -164,7 +164,7 @@ static NTSTATUS cvfs_connect(struct request_context *req, const char *sharename)
fde.private = private;
fde.handler = cifs_socket_handler;
- event_add_fd(conn->smb->events, &fde);
+ event_add_fd(conn->smb_ctx->events, &fde);
/* we need to receive oplock break requests from the server */
cli_oplock_handler(private->transport, oplock_handler, private);
@@ -180,7 +180,7 @@ static NTSTATUS cvfs_disconnect(struct tcon_context *conn)
{
struct cvfs_private *private = conn->ntvfs_private;
- event_remove_fd_all(conn->smb->events, private->transport->socket->fd);
+ event_remove_fd_all(conn->smb_ctx->events, private->transport->socket->fd);
smb_tree_disconnect(private->tree);
cli_tree_close(private->tree);
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 5b61c9285e..8cef711d69 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -249,7 +249,7 @@ static NTSTATUS ipc_open_generic(struct request_context *req, const char *fname,
session_info = req->user_ctx->vuser->session_info;
}
- status = dcesrv_endpoint_search_connect(&req->smb->dcesrv,
+ status = dcesrv_endpoint_search_connect(&req->smb_ctx->dcesrv,
&ep_description,
session_info,
&p->dce_conn);
diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c
index d7d6f67a94..0f5f0badcb 100644
--- a/source4/ntvfs/ntvfs_generic.c
+++ b/source4/ntvfs/ntvfs_generic.c
@@ -290,7 +290,7 @@ NTSTATUS ntvfs_map_fsinfo(struct request_context *req, union smb_fsinfo *fs)
(fs2.generic.out.blocks_free * (double)fs2.generic.out.block_size) / (bpunit * 512);
/* we must return a maximum of 2G to old DOS systems, or they get very confused */
- if (bpunit > 64 && req->smb->negotiate.protocol <= PROTOCOL_LANMAN2) {
+ if (bpunit > 64 && req->smb_ctx->negotiate.protocol <= PROTOCOL_LANMAN2) {
fs->dskattr.out.blocks_per_unit = 64;
fs->dskattr.out.units_total = 0xFFFF;
fs->dskattr.out.units_free = 0xFFFF;