Changeset 745 for trunk/server/source4/libcli/dgram/dgramsocket.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/dgram/dgramsocket.c (modified) (5 diffs)

trunk/server/source4/libcli/dgram/dgramsocket.c

@@ -62 +62 @@
         blob.length = nread;
 
-        DEBUG(2,("Received dgram packet of length %d from %s:%d\n", 
+        DEBUG(5,("Received dgram packet of length %d from %s:%d\n", 
                  (int)blob.length, src->addr, src->port));
 
@@ -72 +72 @@
 
         /* parse the request */
-        ndr_err = ndr_pull_struct_blob(&blob, packet, dgmsock->iconv_convenience, packet,
+        ndr_err = ndr_pull_struct_blob(&blob, packet, packet,
                                       (ndr_pull_flags_fn_t)ndr_pull_nbt_dgram_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -158 +158 @@
 */
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-                                              struct tevent_context *event_ctx,
-                                              struct smb_iconv_convenience *iconv_convenience)
+                                              struct tevent_context *event_ctx)
 {
         struct nbt_dgram_socket *dgmsock;
@@ -184 +183 @@
         dgmsock->incoming.handler = NULL;
         dgmsock->mailslot_handlers = NULL;
-        dgmsock->iconv_convenience = iconv_convenience;
         
         return dgmsock;
@@ -227 +225 @@
         if (talloc_reference(req, dest) == NULL) goto failed;
 
-        ndr_err = ndr_push_struct_blob(&req->encoded, req, dgmsock->iconv_convenience, packet,
+        ndr_err = ndr_push_struct_blob(&req->encoded, req, packet,
                                       (ndr_push_flags_fn_t)ndr_push_nbt_dgram_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {