[SCM] Samba Shared Repository - branch v3-6-test updated

[Volker Lendecke]

The branch, v3-6-test has been updated
       via  a31f756 Fix a valgrind error
      from  f08009e s3: Remove unused mem_ctx arg from set_getdc_request

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit a31f75606079b8a408974f4f25d7c23577955655
Author: Volker Lendecke <v...@samba.org>
Date:   Sun Jan 2 02:48:03 2011 +0100

    Fix a valgrind error
    
    Thanks to Tridge for the hint.
    
    Autobuild-User: Volker Lendecke <vlen...@samba.org>
    Autobuild-Date: Sun Jan  2 10:58:51 CET 2011 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 libcli/nbt/nbtname.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/nbt/nbtname.c b/libcli/nbt/nbtname.c
index 3f0a122..fec8e8e 100644
--- a/libcli/nbt/nbtname.c
+++ b/libcli/nbt/nbtname.c
@@ -83,7 +83,9 @@ static enum ndr_err_code ndr_pull_component(struct ndr_pull 
*ndr,
                        return ndr_pull_error(ndr, NDR_ERR_STRING,
                                              "BAD NBT NAME component");
                }
-               *component = (uint8_t*)talloc_strndup(ndr, (const char 
*)&ndr->data[1 + *offset], len);
+               *component = (uint8_t*)talloc_strndup(
+                       ndr->current_mem_ctx,
+                       (const char *)&ndr->data[1 + *offset], len);
                NDR_ERR_HAVE_NO_MEMORY(*component);
                *offset += len + 1;
                *max_offset = MAX(*max_offset, *offset);
@@ -127,7 +129,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_string(struct 
ndr_pull *ndr, int ndr_fla
                                      "BAD NBT NAME too many components");
        }
        if (num_components == 0) {
-               name = talloc_strdup(ndr, "");
+               name = talloc_strdup(ndr->current_mem_ctx, "");
                NDR_ERR_HAVE_NO_MEMORY(name);
        }
 


-- 
Samba Shared Repository