[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1857-gb3f2a3a

[Günther Deschner]

The branch, master has been updated
       via  b3f2a3a488f868c4aa31c49bc145a8a6e81de3b5 (commit)
      from  e63d9c29c99c5311c9f4a8dbe432ff4cea4fb924 (commit)

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


- Log -----------------------------------------------------------------
commit b3f2a3a488f868c4aa31c49bc145a8a6e81de3b5
Author: Günther Deschner <g...@samba.org>
Date:   Thu May 28 15:32:55 2009 +0200

    s3-winbindd: fix remaining callers of sid_binstring().
    
    Guenther

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

Summary of changes:
 source3/winbindd/idmap_adex/gc_util.c          |    4 ++--
 source3/winbindd/idmap_adex/provider_unified.c |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_adex/gc_util.c 
b/source3/winbindd/idmap_adex/gc_util.c
index 58e641b..879c2e0 100644
--- a/source3/winbindd/idmap_adex/gc_util.c
+++ b/source3/winbindd/idmap_adex/gc_util.c
@@ -716,11 +716,11 @@ done:
 
        *name = NULL;
 
-       sid_string = sid_binstring(sid);
+       sid_string = sid_binstring(frame, sid);
        BAIL_ON_PTR_ERROR(sid_string, nt_status);
 
        filter = talloc_asprintf(frame, "(objectSid=%s)", sid_string);
-       SAFE_FREE(sid_string);
+       TALLOC_FREE(sid_string);
        BAIL_ON_PTR_ERROR(filter, nt_status);
 
        nt_status = gc_search_all_forests_unique(filter, &ads, &msg);
diff --git a/source3/winbindd/idmap_adex/provider_unified.c 
b/source3/winbindd/idmap_adex/provider_unified.c
index f9d73f5..00db018 100644
--- a/source3/winbindd/idmap_adex/provider_unified.c
+++ b/source3/winbindd/idmap_adex/provider_unified.c
@@ -483,11 +483,11 @@ static NTSTATUS search_forest(struct likewise_cell 
*forest_cell,
 
                switch (fdata->ftype) {
                case SidFilter:
-                       sid_binstr = sid_binstring(&fdata->filter.sid);
+                       sid_binstr = sid_binstring(frame, &fdata->filter.sid);
                        BAIL_ON_PTR_ERROR(sid_binstr, nt_status);
 
                        filter = talloc_asprintf(frame, "(objectSid=%s)", 
sid_binstr);
-                       SAFE_FREE(sid_binstr);
+                       TALLOC_FREE(sid_binstr);
                        break;
                case IdFilter:
                        filter = build_id_filter(fdata->filter.id.id,


-- 
Samba Shared Repository