[SCM] Samba Shared Repository - branch master updated

[Michael Adam]

The branch, master has been updated
       via  612a333... s3:winbind:idmap_tdb2_set_mapping: untangle assignment 
from check
      from  2c61c93... Fix bug 7442 - Samba returns incorrect SMB2 QFS device 
info.

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


- Log -----------------------------------------------------------------
commit 612a333d658990aeb4188ee984a53b2e6bc65780
Author: Michael Adam <ob...@samba.org>
Date:   Tue May 18 15:25:53 2010 +0200

    s3:winbind:idmap_tdb2_set_mapping: untangle assignment from check

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

Summary of changes:
 source3/winbindd/idmap_tdb2.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/idmap_tdb2.c b/source3/winbindd/idmap_tdb2.c
index 0925b84..f39969d 100644
--- a/source3/winbindd/idmap_tdb2.c
+++ b/source3/winbindd/idmap_tdb2.c
@@ -906,7 +906,8 @@ static NTSTATUS idmap_tdb2_set_mapping(struct idmap_domain 
*dom, const struct id
                goto done;
        }
 
-       if (!(ksidstr = sid_string_talloc(ctx, map->sid))) {
+       ksidstr = sid_string_talloc(ctx, map->sid);
+       if (ksidstr == NULL) {
                DEBUG(0, ("Out of memory!\n"));
                ret = NT_STATUS_NO_MEMORY;
                goto done;


-- 
Samba Shared Repository