diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-06-29 07:40:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:56:49 -0500 |
| commit | 118f3edd27f5adacc1da636ed05b33f04999584f (patch) | |
| tree | b4b314537144d48820589e925c4e3fb08f293ee5 /source4/ntvfs | |
| parent | b87fa55bdc69fe50743ddb58977e408853abb4cb (diff) | |
| download | samba-118f3edd27f5adacc1da636ed05b33f04999584f.tar.gz samba-118f3edd27f5adacc1da636ed05b33f04999584f.tar.bz2 samba-118f3edd27f5adacc1da636ed05b33f04999584f.zip | |
r1291: rename struct smbsrv_context to smbsrv_connection
because this is the connection state per transport layer (tcp)
connection
I also moved the substructs directly into smbsrv_connection,
because they don't need a struct name and we should allway pass the complete
smbsrv_connection struct into functions
metze
(This used to be commit 60f823f201fcedf5473008e8453a6351e73a92c7)
Diffstat (limited to 'source4/ntvfs')
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 8 | ||||
| -rw-r--r-- | source4/ntvfs/ipc/vfs_ipc.c | 2 | ||||
| -rw-r--r-- | source4/ntvfs/ntvfs_generic.c | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index b0389b9e59..93b9f2630e 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->tcon->smb_ctx->socket.fd)) { - smbd_process_async(private->tcon->smb_ctx); + if (socket_pending(private->tcon->smb_conn->socket.fd)) { + smbd_process_async(private->tcon->smb_conn); } } @@ -164,7 +164,7 @@ static NTSTATUS cvfs_connect(struct smbsrv_request *req, const char *sharename) fde.private = private; fde.handler = cifs_socket_handler; - event_add_fd(tcon->smb_ctx->events, &fde); + event_add_fd(tcon->smb_conn->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 smbsrv_tcon *tcon) { struct cvfs_private *private = tcon->ntvfs_private; - event_remove_fd_all(tcon->smb_ctx->events, private->transport->socket->fd); + event_remove_fd_all(tcon->smb_conn->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 8d3eaa2bb4..cf8b49ebb8 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 smbsrv_request *req, const char *fname, session_info = req->user_ctx->vuser->session_info; } - status = dcesrv_endpoint_search_connect(&req->smb_ctx->dcesrv, + status = dcesrv_endpoint_search_connect(&req->smb_conn->dcesrv, &ep_description, session_info, &p->dce_conn); diff --git a/source4/ntvfs/ntvfs_generic.c b/source4/ntvfs/ntvfs_generic.c index ba2ec344f4..36cbcabbd5 100644 --- a/source4/ntvfs/ntvfs_generic.c +++ b/source4/ntvfs/ntvfs_generic.c @@ -290,7 +290,7 @@ NTSTATUS ntvfs_map_fsinfo(struct smbsrv_request *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_ctx->negotiate.protocol <= PROTOCOL_LANMAN2) { + if (bpunit > 64 && req->smb_conn->negotiate.protocol <= PROTOCOL_LANMAN2) { fs->dskattr.out.blocks_per_unit = 64; fs->dskattr.out.units_total = 0xFFFF; fs->dskattr.out.units_free = 0xFFFF; |