diff options
Diffstat (limited to 'source4/smb_server')
| -rw-r--r-- | source4/smb_server/smb/nttrans.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb/reply.c | 12 | ||||
| -rw-r--r-- | source4/smb_server/smb/trans2.c | 2 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.h | 2 | ||||
| -rw-r--r-- | source4/smb_server/tcon.c | 2 |
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) { |