The branch, master has been updated
       via  d4a87ee966adb9205169507fca5c07faefc4513e (commit)
       via  d5c20c072b464b675fbd5f37a94ae8a6ad403d49 (commit)
       via  9f0bdd4e17ef5fe0b28a8ec4676d19eb4ffe6786 (commit)
      from  f6bed79ec6f287ac5da79151b97b6cf4776aab7a (commit)

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


- Log -----------------------------------------------------------------
commit d4a87ee966adb9205169507fca5c07faefc4513e
Author: Jeremy Allison <j...@samba.org>
Date:   Thu Jul 16 18:14:56 2009 -0700

    Replace more long-lived contexts with talloc_autofree_context().
    Jeremy.

commit d5c20c072b464b675fbd5f37a94ae8a6ad403d49
Author: Jeremy Allison <j...@samba.org>
Date:   Thu Jul 16 18:13:46 2009 -0700

    Replace short-lived NULL talloc contexts with talloc_tos().
    Jeremy.

commit 9f0bdd4e17ef5fe0b28a8ec4676d19eb4ffe6786
Author: Jeremy Allison <j...@samba.org>
Date:   Thu Jul 16 18:12:17 2009 -0700

    Remove an unused talloc context.
    Jeremy.

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

Summary of changes:
 source3/auth/auth.c      |   10 ++--------
 source3/lib/charcnv.c    |    8 ++++----
 source3/lib/ctdbd_conn.c |    2 +-
 source3/lib/dbwrap_tdb.c |    2 +-
 source3/lib/util_str.c   |   34 +++++++++++++++++-----------------
 source3/libsmb/spnego.c  |    2 +-
 6 files changed, 26 insertions(+), 32 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index fd4c503..ce8722a 100644
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -82,7 +82,6 @@ static void get_ntlm_challenge(struct auth_context 
*auth_context,
        DATA_BLOB challenge = data_blob_null;
        const char *challenge_set_by = NULL;
        auth_methods *auth_method;
-       TALLOC_CTX *mem_ctx;
 
        if (auth_context->challenge.length) {
                DEBUG(5, ("get_ntlm_challenge (auth subsystem): returning 
previous challenge by module %s (normal)\n", 
@@ -106,12 +105,8 @@ static void get_ntlm_challenge(struct auth_context 
*auth_context,
                        continue;
                }
 
-               mem_ctx = talloc_init("auth_get_challenge for module %s", 
auth_method->name);
-               if (!mem_ctx) {
-                       smb_panic("talloc_init() failed!");
-               }
-
-               challenge = auth_method->get_chal(auth_context, 
&auth_method->private_data, mem_ctx);
+               challenge = auth_method->get_chal(auth_context, 
&auth_method->private_data,
+                                       auth_context->mem_ctx);
                if (!challenge.length) {
                        DEBUG(3, ("auth_get_challenge: getting challenge from 
authentication method %s FAILED.\n", 
                                  auth_method->name));
@@ -121,7 +116,6 @@ static void get_ntlm_challenge(struct auth_context 
*auth_context,
                        challenge_set_by = auth_method->name;
                        auth_context->challenge_set_method = auth_method;
                }
-               talloc_destroy(mem_ctx);
        }
 
        if (!challenge_set_by) {
diff --git a/source3/lib/charcnv.c b/source3/lib/charcnv.c
index a1663c1..272f107 100644
--- a/source3/lib/charcnv.c
+++ b/source3/lib/charcnv.c
@@ -753,7 +753,7 @@ size_t unix_strupper(const char *src, size_t srclen, char 
*dest, size_t destlen)
        size_t size;
        smb_ucs2_t *buffer;
 
-       if (!push_ucs2_talloc(NULL, &buffer, src, &size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &size)) {
                return (size_t)-1;
        }
 
@@ -837,7 +837,7 @@ size_t unix_strlower(const char *src, size_t srclen, char 
*dest, size_t destlen)
        size_t size;
        smb_ucs2_t *buffer = NULL;
 
-       if (!convert_string_talloc(NULL, CH_UNIX, CH_UTF16LE, src, srclen,
+       if (!convert_string_talloc(talloc_tos(), CH_UNIX, CH_UTF16LE, src, 
srclen,
                                   (void **)(void *)&buffer, &size,
                                   True))
        {
@@ -951,7 +951,7 @@ size_t push_ascii_nstring(void *dest, const char *src)
        smb_ucs2_t *buffer;
 
        conv_silent = True;
-       if (!push_ucs2_talloc(NULL, &buffer, src, &buffer_len)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer, src, &buffer_len)) {
                smb_panic("failed to create UCS2 buffer");
        }
 
@@ -1268,7 +1268,7 @@ static size_t push_utf8(void *dest, const char *src, 
size_t dest_len, int flags)
        }
 
        if (flags & STR_UPPER) {
-               tmpbuf = strupper_talloc(NULL, src);
+               tmpbuf = strupper_talloc(talloc_tos(), src);
                if (!tmpbuf) {
                        return (size_t)-1;
                }
diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c
index dde3775..449e049 100644
--- a/source3/lib/ctdbd_conn.c
+++ b/source3/lib/ctdbd_conn.c
@@ -358,7 +358,7 @@ static NTSTATUS ctdb_read_req(struct ctdbd_connection 
*conn, uint32 reqid,
                        goto next_pkt;
                }
 
-               if (!(msg_state = TALLOC_P(NULL, struct deferred_msg_state))) {
+               if (!(msg_state = TALLOC_P(talloc_autofree_context(), struct 
deferred_msg_state))) {
                        DEBUG(0, ("talloc failed\n"));
                        TALLOC_FREE(hdr);
                        goto next_pkt;
diff --git a/source3/lib/dbwrap_tdb.c b/source3/lib/dbwrap_tdb.c
index c71e073..297a351 100644
--- a/source3/lib/dbwrap_tdb.c
+++ b/source3/lib/dbwrap_tdb.c
@@ -94,7 +94,7 @@ static struct db_record *db_tdb_fetch_locked(struct 
db_context *db,
 
        /* Do not accidently allocate/deallocate w/o need when debug level is 
lower than needed */
        if(DEBUGLEVEL >= 10) {
-               char *keystr = hex_encode_talloc(NULL, (unsigned 
char*)key.dptr, key.dsize);
+               char *keystr = hex_encode_talloc(talloc_tos(), (unsigned 
char*)key.dptr, key.dsize);
                DEBUG(10, (DEBUGLEVEL > 10
                           ? "Locking key %s\n" : "Locking key %.20s\n",
                           keystr));
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index 0aff943..c197fd7 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -96,14 +96,14 @@ int StrCaseCmp(const char *s, const char *t)
                        return +1;
        }
 
-       if (!push_ucs2_talloc(NULL, &buffer_s, ps, &size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer_s, ps, &size)) {
                return strcmp(ps, pt);
                /* Not quite the right answer, but finding the right one
                   under this failure case is expensive, and it's pretty
                   close */
        }
 
-       if (!push_ucs2_talloc(NULL, &buffer_t, pt, &size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer_t, pt, &size)) {
                TALLOC_FREE(buffer_s);
                return strcmp(ps, pt);
                /* Not quite the right answer, but finding the right one
@@ -157,14 +157,14 @@ int StrnCaseCmp(const char *s, const char *t, size_t len)
                return 0;
        }
 
-       if (!push_ucs2_talloc(NULL, &buffer_s, ps, &size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer_s, ps, &size)) {
                return strncmp(ps, pt, len-n);
                /* Not quite the right answer, but finding the right one
                   under this failure case is expensive,
                   and it's pretty close */
        }
 
-       if (!push_ucs2_talloc(NULL, &buffer_t, pt, &size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &buffer_t, pt, &size)) {
                TALLOC_FREE(buffer_s);
                return strncmp(ps, pt, len-n);
                /* Not quite the right answer, but finding the right one
@@ -366,7 +366,7 @@ size_t str_charnum(const char *s)
 {
        size_t ret, converted_size;
        smb_ucs2_t *tmpbuf2 = NULL;
-       if (!push_ucs2_talloc(NULL, &tmpbuf2, s, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &tmpbuf2, s, &converted_size)) {
                return 0;
        }
        ret = strlen_w(tmpbuf2);
@@ -384,7 +384,7 @@ size_t str_ascii_charnum(const char *s)
 {
        size_t ret, converted_size;
        char *tmpbuf2 = NULL;
-       if (!push_ascii_talloc(NULL, &tmpbuf2, s, &converted_size)) {
+       if (!push_ascii_talloc(talloc_tos(), &tmpbuf2, s, &converted_size)) {
                return 0;
        }
        ret = strlen(tmpbuf2);
@@ -455,7 +455,7 @@ bool strhasupper(const char *s)
        bool ret;
        size_t converted_size;
 
-       if (!push_ucs2_talloc(NULL, &tmp, s, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &tmp, s, &converted_size)) {
                return false;
        }
 
@@ -480,7 +480,7 @@ bool strhaslower(const char *s)
        bool ret;
        size_t converted_size;
 
-       if (!push_ucs2_talloc(NULL, &tmp, s, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &tmp, s, &converted_size)) {
                return false;
        }
 
@@ -1177,7 +1177,7 @@ char *strchr_m(const char *src, char c)
        s = src;
 #endif
 
-       if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
                /* Wrong answer, but what can we do... */
                return strchr(src, c);
        }
@@ -1187,7 +1187,7 @@ char *strchr_m(const char *src, char c)
                return NULL;
        }
        *p = 0;
-       if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+       if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
                SAFE_FREE(ws);
                /* Wrong answer, but what can we do... */
                return strchr(src, c);
@@ -1248,7 +1248,7 @@ char *strrchr_m(const char *s, char c)
                char *ret;
                size_t converted_size;
 
-               if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+               if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
                        /* Wrong answer, but what can we do. */
                        return strrchr(s, c);
                }
@@ -1258,7 +1258,7 @@ char *strrchr_m(const char *s, char c)
                        return NULL;
                }
                *p = 0;
-               if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+               if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
                        TALLOC_FREE(ws);
                        /* Wrong answer, but what can we do. */
                        return strrchr(s, c);
@@ -1283,7 +1283,7 @@ char *strnrchr_m(const char *s, char c, unsigned int n)
        char *ret;
        size_t converted_size;
 
-       if (!push_ucs2_talloc(NULL, &ws, s, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &ws, s, &converted_size)) {
                /* Too hard to try and get right. */
                return NULL;
        }
@@ -1293,7 +1293,7 @@ char *strnrchr_m(const char *s, char c, unsigned int n)
                return NULL;
        }
        *p = 0;
-       if (!pull_ucs2_talloc(NULL, &s2, ws, &converted_size)) {
+       if (!pull_ucs2_talloc(talloc_tos(), &s2, ws, &converted_size)) {
                TALLOC_FREE(ws);
                /* Too hard to try and get right. */
                return NULL;
@@ -1352,12 +1352,12 @@ char *strstr_m(const char *src, const char *findstr)
        s = src;
 #endif
 
-       if (!push_ucs2_talloc(NULL, &src_w, src, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &src_w, src, &converted_size)) {
                DEBUG(0,("strstr_m: src malloc fail\n"));
                return NULL;
        }
 
-       if (!push_ucs2_talloc(NULL, &find_w, findstr, &converted_size)) {
+       if (!push_ucs2_talloc(talloc_tos(), &find_w, findstr, &converted_size)) 
{
                TALLOC_FREE(src_w);
                DEBUG(0,("strstr_m: find malloc fail\n"));
                return NULL;
@@ -1372,7 +1372,7 @@ char *strstr_m(const char *src, const char *findstr)
        }
 
        *p = 0;
-       if (!pull_ucs2_talloc(NULL, &s2, src_w, &converted_size)) {
+       if (!pull_ucs2_talloc(talloc_tos(), &s2, src_w, &converted_size)) {
                TALLOC_FREE(src_w);
                TALLOC_FREE(find_w);
                DEBUG(0,("strstr_m: dest malloc fail\n"));
diff --git a/source3/libsmb/spnego.c b/source3/libsmb/spnego.c
index ee2c3c3..3fa9559 100644
--- a/source3/libsmb/spnego.c
+++ b/source3/libsmb/spnego.c
@@ -41,7 +41,7 @@ static bool read_negTokenInit(ASN1_DATA *asn1, negTokenInit_t 
*token)
                        asn1_start_tag(asn1, ASN1_CONTEXT(0));
                        asn1_start_tag(asn1, ASN1_SEQUENCE(0));
 
-                       token->mechTypes = TALLOC_P(NULL, const char *);
+                       token->mechTypes = TALLOC_P(talloc_autofree_context(), 
const char *);
                        for (i = 0; !asn1->has_error &&
                                     0 < asn1_tag_remaining(asn1); i++) {
                                const char *p_oid = NULL;


-- 
Samba Shared Repository

Reply via email to