diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-11-09 08:13:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:45:56 -0500 |
| commit | 1c07c25322802eef7b57dda3975baca6c9114c83 (patch) | |
| tree | 702ec96e983e546d1bbbcf553076f7deee83e0c0 /source4/ntvfs/cifs | |
| parent | 8752e38c05779b6ff72bb0bf49940ef6afe55184 (diff) | |
| download | samba-1c07c25322802eef7b57dda3975baca6c9114c83.tar.gz samba-1c07c25322802eef7b57dda3975baca6c9114c83.tar.bz2 samba-1c07c25322802eef7b57dda3975baca6c9114c83.zip | |
r11596: switched the libcli/raw/ code over to using the lib/stream/ generic
packet parsing code. This simplifies the logic in the raw client
library a fair bit
(This used to be commit f8d43f1f67876360e1295d85a3c3702d1d60ed7b)
Diffstat (limited to 'source4/ntvfs/cifs')
| -rw-r--r-- | source4/ntvfs/cifs/vfs_cifs.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c index 44c31d91ad..b0d0d06552 100644 --- a/source4/ntvfs/cifs/vfs_cifs.c +++ b/source4/ntvfs/cifs/vfs_cifs.c @@ -63,21 +63,6 @@ static BOOL oplock_handler(struct smbcli_transport *transport, uint16_t tid, uin return req_send_oplock_break(private->tcon, fnum, level); } - /* - a handler for read events on a connection to a backend server -*/ -static void cifs_socket_handler(struct event_context *ev, struct fd_event *fde, - uint16_t flags, void *private) -{ - struct cvfs_private *cvfs = talloc_get_type(private, struct cvfs_private); - struct smbsrv_tcon *tcon = cvfs->tcon; - - if (!smbcli_transport_process(cvfs->transport)) { - /* the connection to our server is dead */ - talloc_free(tcon); - } -} - /* connect to a share - used when a tree_connect operation comes in. */ @@ -90,7 +75,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, const char *host, *user, *pass, *domain, *remote_share; struct smb_composite_connect io; struct composite_context *creq; - struct fd_event *fde; struct cli_credentials *credentials; BOOL machine_account; @@ -180,17 +164,6 @@ static NTSTATUS cvfs_connect(struct ntvfs_module_context *ntvfs, /* we need to receive oplock break requests from the server */ smbcli_oplock_handler(private->transport, oplock_handler, private); - /* take over event handling for this socket */ - talloc_free(private->transport->socket->event.fde); - fde = event_add_fd(private->transport->socket->event.ctx, - private, - socket_get_fd(private->transport->socket->sock), - EVENT_FD_READ | EVENT_FD_WRITE, - cifs_socket_handler, - private); - private->transport->socket->event.fde = fde; - - private->map_generic = lp_parm_bool(req->tcon->service, "cifs", "mapgeneric", False); |