Changeset 740 for vendor/current/source4/libcli/dgram

Timestamp:

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

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

Location:

vendor/current/source4/libcli/dgram

Files:

• browse.c (modified) (3 diffs)
• dgramsocket.c (modified) (5 diffs)
• libdgram.h (modified) (3 diffs)
• mailslot.c (modified) (1 diff)
• netlogon.c (modified) (4 diffs)

vendor/current/source4/libcli/dgram/browse.c

@@ -39 +39 @@
         TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, dgmsock->iconv_convenience, request,
+        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
                                       (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -67 +67 @@
         struct socket_address *dest;
 
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, dgmsock->iconv_convenience, reply,
+        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, reply,
                                       (ndr_push_flags_fn_t)ndr_push_nbt_browse_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -100 +100 @@
         enum ndr_err_code ndr_err;
 
-        ndr_err = ndr_pull_struct_blob(&data, mem_ctx, dgmslot->dgmsock->iconv_convenience, pkt,
+        ndr_err = ndr_pull_struct_blob(&data, mem_ctx, pkt,
                                       (ndr_pull_flags_fn_t)ndr_pull_nbt_browse_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {

vendor/current/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)) {

vendor/current/source4/libcli/dgram/libdgram.h

@@ -20 +20 @@
 */
 
-#include "../libcli/netlogon.h"
+#include "../libcli/netlogon/netlogon.h"
 
 /*
@@ -41 +41 @@
         struct socket_context *sock;
         struct tevent_context *event_ctx;
-        struct smb_iconv_convenience *iconv_convenience;
 
         /* the fd event */
@@ -94 +93 @@
                                     void *private_data);
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
-                                               struct tevent_context *event_ctx,
-                                               struct smb_iconv_convenience *);
+                                               struct tevent_context *event_ctx);
 
 const char *dgram_mailslot_name(struct nbt_dgram_packet *packet);

vendor/current/source4/libcli/dgram/mailslot.c

@@ -130 +130 @@
                 if (dgram_mailslot_find(dgmsock, name)) {
                         talloc_free(name);
-                        return NULL;
+                        continue;
                 }
                 dgmslot = dgram_mailslot_listen(dgmsock, name, handler, private_data);

vendor/current/source4/libcli/dgram/netlogon.c

@@ -41 +41 @@
         TALLOC_CTX *tmp_ctx = talloc_new(dgmsock);
 
-        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, 
-                                       dgmsock->iconv_convenience,
-                                       request,
+        ndr_err = ndr_push_struct_blob(&blob, tmp_ctx, request,
                                       (ndr_push_flags_fn_t)ndr_push_nbt_netlogon_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
@@ -75 +73 @@
         struct socket_address *dest;
 
-        status = push_nbt_netlogon_response(&blob, tmp_ctx, dgmsock->iconv_convenience,
-                                            reply);
+        status = push_nbt_netlogon_response(&blob, tmp_ctx, reply);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;
@@ -111 +108 @@
         enum ndr_err_code ndr_err;
 
-        ndr_err = ndr_pull_struct_blob(&data, mem_ctx, dgmslot->dgmsock->iconv_convenience, netlogon,
-                                      (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
+        ndr_err = ndr_pull_struct_blob(&data, mem_ctx, netlogon,
+           (ndr_pull_flags_fn_t)ndr_pull_nbt_netlogon_packet);
         if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
                 NTSTATUS status = ndr_map_error2ntstatus(ndr_err);
@@ -136 +133 @@
         DATA_BLOB data = dgram_mailslot_data(dgram);
         
-        status = pull_nbt_netlogon_response(&data, mem_ctx, dgmslot->dgmsock->iconv_convenience, netlogon);
+        status = pull_nbt_netlogon_response(&data, mem_ctx, netlogon);
         if (!NT_STATUS_IS_OK(status)) {
                 return status;