[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  9ecc308... s3: Slightly simplify unmap_unix_group
      from  c377a91... Attempt to fix the build on AIX, that system seems to have a #define for s_type

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


- Log -----------------------------------------------------------------
commit 9ecc30837bc75ef1c85191f494d65c7ce9b1ba23
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Mar 14 19:45:26 2010 +0100

    s3: Slightly simplify unmap_unix_group

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

Summary of changes:
 source3/utils/net_sam.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/net_sam.c b/source3/utils/net_sam.c
index 6e3ccfe..5c3f4e5 100644
--- a/source3/utils/net_sam.c
+++ b/source3/utils/net_sam.c
@@ -894,7 +894,6 @@ static int net_sam_mapunixgroup(struct net_context *c, int argc, const char **ar
 
 static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
 {
-        NTSTATUS status;
         GROUP_MAP map;
         const char *grpname;
         DOM_SID dom_sid;
@@ -914,9 +913,7 @@ static NTSTATUS unmap_unix_group(const struct group *grp, GROUP_MAP *pmap)
                 return NT_STATUS_UNSUCCESSFUL;
         }
 
-        status = pdb_delete_group_mapping_entry(dom_sid);
-
-        return status;
+        return pdb_delete_group_mapping_entry(dom_sid);
 }
 
 static int net_sam_unmapunixgroup(struct net_context *c, int argc, const char **argv)


-- 
Samba Shared Repository