Changeset 740 for vendor/current/libcli/nbt/nbtsocket.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/libcli/nbt/nbtsocket.c (modified) (6 diffs)

vendor/current/libcli/nbt/nbtsocket.c

@@ -192 +192 @@
 
         /* parse the request */
-        ndr_err = ndr_pull_struct_blob(&blob, packet, nbtsock->iconv_convenience, packet,
+        ndr_err = ndr_pull_struct_blob(&blob, packet, packet,
                                        (ndr_pull_flags_fn_t)ndr_pull_nbt_name_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -333 +333 @@
 */
 _PUBLIC_ struct nbt_name_socket *nbt_name_socket_init(TALLOC_CTX *mem_ctx,
-                                             struct tevent_context *event_ctx,
-                                             struct smb_iconv_convenience *iconv_convenience)
+                                             struct tevent_context *event_ctx)
 {
         struct nbt_name_socket *nbtsock;
@@ -342 +341 @@
         if (nbtsock == NULL) goto failed;
 
-        nbtsock->event_ctx = talloc_reference(nbtsock, event_ctx);
+        nbtsock->event_ctx = event_ctx;
         if (nbtsock->event_ctx == NULL) goto failed;
 
@@ -359 +358 @@
         nbtsock->incoming.handler = NULL;
         nbtsock->unexpected.handler = NULL;
-        nbtsock->iconv_convenience = iconv_convenience;
 
         nbtsock->fde = event_add_fd(nbtsock->event_ctx, nbtsock,
@@ -417 +415 @@
 
         ndr_err = ndr_push_struct_blob(&req->encoded, req,
-                                       req->nbtsock->iconv_convenience,
                                        request,
                                        (ndr_push_flags_fn_t)ndr_push_nbt_name_packet);
@@ -466 +463 @@
 
         ndr_err = ndr_push_struct_blob(&req->encoded, req,
-                                       req->nbtsock->iconv_convenience,
                                        request,
                                        (ndr_push_flags_fn_t)ndr_push_nbt_name_packet);