Changeset 745 for trunk/server/librpc/ndr/ndr_compression.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)
• librpc/ndr/ndr_compression.c (modified) (4 diffs)

trunk/server/librpc/ndr/ndr_compression.c

@@ -392 +392 @@
         z_stream z;
 
-        ndrpush = ndr_push_init_ctx(subndr, subndr->iconv_convenience);
+        ndrpush = ndr_push_init_ctx(subndr);
         NDR_ERR_HAVE_NO_MEMORY(ndrpush);
 
@@ -431 +431 @@
         comndr->data_size       = uncompressed.length;
         comndr->offset          = 0;
-
-        comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience);
 
         *_comndr = comndr;
@@ -466 +464 @@
         }
 
-        uncomndr = ndr_push_init_ctx(subndr, subndr->iconv_convenience);
+        uncomndr = ndr_push_init_ctx(subndr);
         NDR_ERR_HAVE_NO_MEMORY(uncomndr);
         uncomndr->flags = subndr->flags;
@@ -493 +491 @@
         ndrpull->offset         = 0;
 
-        ndrpull->iconv_convenience = talloc_reference(ndrpull, subndr->iconv_convenience);
-
         switch (compression_alg) {
         case NDR_COMPRESSION_MSZIP: