[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  044f8f7 group_mapping: Avoid a talloc
      from  0c2fbe5 samba:python - Py_RETURN_NONE remove compatibility code for releases < 2.4

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


- Log -----------------------------------------------------------------
commit 044f8f71903084717271038d931d7dd47e8e74c3
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 3 16:01:35 2013 +0100

    group_mapping: Avoid a talloc
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu Jan  9 20:41:15 CET 2014 on sn-devel-104

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

Summary of changes:
 source3/groupdb/mapping_tdb.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c
index 088874f..3cb1024 100644
--- a/source3/groupdb/mapping_tdb.c
+++ b/source3/groupdb/mapping_tdb.c
@@ -119,17 +119,15 @@ static bool init_group_mapping(void)
 
 static char *group_mapping_key(TALLOC_CTX *mem_ctx, const struct dom_sid *sid)
 {
-	char *sidstr, *result;
+	char sidstr[DOM_SID_STR_BUFLEN];
+	int len;
 
-	sidstr = sid_string_talloc(talloc_tos(), sid);
-	if (sidstr == NULL) {
+	len = dom_sid_string_buf(sid, sidstr, sizeof(sidstr));
+	if (len >= sizeof(sidstr)) {
 		return NULL;
 	}
 
-	result = talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
-
-	TALLOC_FREE(sidstr);
-	return result;
+	return talloc_asprintf(mem_ctx, "%s%s", GROUP_PREFIX, sidstr);
 }
 
 /****************************************************************************


-- 
Samba Shared Repository