diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-11-14 03:45:57 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:46:17 -0500 |
| commit | 614950aed35353854019db5cccec5b3154643ca3 (patch) | |
| tree | 6322c8d22dc2da4fad46976651ed208b131911b3 /source4/libcli | |
| parent | 763d862fee5c8d73088e93da0c5a2857eb77afc3 (diff) | |
| download | samba-614950aed35353854019db5cccec5b3154643ca3.tar.gz samba-614950aed35353854019db5cccec5b3154643ca3.tar.bz2 samba-614950aed35353854019db5cccec5b3154643ca3.zip | |
r11713: separate out the setting of the fde in the packet context from the
enabling of packet serialisation
(This used to be commit 6a47cd65a8b588f9ddd375c57caaba08281e7cbb)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/ldap/ldap_client.c | 3 | ||||
| -rw-r--r-- | source4/libcli/raw/clitransport.c | 3 | ||||
| -rw-r--r-- | source4/libcli/smb2/transport.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index 503016e896..a5f647939f 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -398,7 +398,8 @@ static void ldap_connect_recv_conn(struct composite_context *ctx) packet_set_full_request(conn->packet, ldap_complete_packet); packet_set_error_handler(conn->packet, ldap_error_handler); packet_set_event_context(conn->packet, conn->event.event_ctx); - packet_set_serialise(conn->packet, conn->event.fde); + packet_set_fde(conn->packet, conn->event.fde); + packet_set_serialise(conn->packet); composite_done(state->ctx); diff --git a/source4/libcli/raw/clitransport.c b/source4/libcli/raw/clitransport.c index fba6c36bbe..b60ea1dc02 100644 --- a/source4/libcli/raw/clitransport.c +++ b/source4/libcli/raw/clitransport.c @@ -121,7 +121,8 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock, smbcli_transport_event_handler, transport); - packet_set_serialise(transport->packet, transport->socket->event.fde); + packet_set_fde(transport->packet, transport->socket->event.fde); + packet_set_serialise(transport->packet); talloc_set_destructor(transport, transport_destructor); diff --git a/source4/libcli/smb2/transport.c b/source4/libcli/smb2/transport.c index e87c7a68c0..c6fc890e34 100644 --- a/source4/libcli/smb2/transport.c +++ b/source4/libcli/smb2/transport.c @@ -107,7 +107,8 @@ struct smb2_transport *smb2_transport_init(struct smbcli_socket *sock, smb2_transport_event_handler, transport); - packet_set_serialise(transport->packet, transport->socket->event.fde); + packet_set_fde(transport->packet, transport->socket->event.fde); + packet_set_serialise(transport->packet); talloc_set_destructor(transport, transport_destructor); |