[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  111f4ec s3: Use talloc_tos() in the S3 build
      from  53e0bad build: Bring DYNCONFIG into samba-util library to avoid 
symbol duplication

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 111f4ec8b742898310a0e1df6aceeb3dbfdc822c
Author: Volker Lendecke <v...@samba.org>
Date:   Wed Apr 13 08:35:00 2011 +0200

    s3: Use talloc_tos() in the S3 build
    
    Autobuild-User: Volker Lendecke <vlen...@samba.org>
    Autobuild-Date: Wed Apr 13 09:30:55 CEST 2011 on sn-devel-104

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

Summary of changes:
 libcli/auth/smbencrypt.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c
index cbb2eb5..d090345 100644
--- a/libcli/auth/smbencrypt.c
+++ b/libcli/auth/smbencrypt.c
@@ -118,6 +118,7 @@ bool E_deshash(const char *passwd, uint8_t p16[16])
 {
        bool ret;
        uint8_t dospwd[14];
+       TALLOC_CTX *mem_ctx;
 
        size_t converted_size;
 
@@ -125,7 +126,12 @@ bool E_deshash(const char *passwd, uint8_t p16[16])
 
        ZERO_STRUCT(dospwd);
 
-       tmpbuf = strupper_talloc(NULL, passwd);
+#if _SAMBA_BUILD_ == 3
+       mem_ctx = talloc_tos();
+#else
+       mem_ctx = NULL;
+#endif
+       tmpbuf = strupper_talloc(mem_ctx, passwd);
        if (tmpbuf == NULL) {
                /* Too many callers don't check this result, we need to fill in 
the buffer with something */
                safe_strcpy((char *)dospwd, passwd, sizeof(dospwd)-1);


-- 
Samba Shared Repository