Changeset 745 for trunk/server/source4/libcli/dgram/netlogon.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/netlogon.c (modified) (4 diffs)

trunk/server/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;