r13316: Let the carnage begin....

[kai/samba.git] / source / utils / net_groupmap.c

diff --git a/source/utils/net_groupmap.c b/source/utils/net_groupmap.c
index 1cff120c393130069f2b5cf804b6d9b164cbd894..96a6aa531aabc98bd007ac911cfbe38169ec1134 100644 (file)
--- a/source/utils/net_groupmap.c
+++ b/source/utils/net_groupmap.c
@@ -93,6 +93,7 @@ static void print_map_entry ( GROUP_MAP map, BOOL long_list )
        else {
                d_printf("%s\n", map.nt_name);
                d_printf("\tSID       : %s\n", sid_string_static(&map.sid));
+               d_printf("\tUnix gid  : %d\n", map.gid);
                d_printf("\tUnix group: %s\n", gidtoname(map.gid));
                d_printf("\tGroup type: %s\n",
                         sid_type_lookup(map.sid_name_use));
@@ -261,10 +262,26 @@ static int net_groupmap_add(int argc, const char **argv)
                d_fprintf(stderr, "Can't lookup UNIX group %s\n", unixgrp);
                return -1;
        }
+
+       {
+               GROUP_MAP map;
+               if (pdb_getgrgid(&map, gid)) {
+                       d_printf("Unix group %s already mapped to SID %s\n",
+                                unixgrp, sid_string_static(&map.sid));
+                       return -1;
+               }
+       }
        
        if ( (rid == 0) && (string_sid[0] == '\0') ) {
-               d_printf("No rid or sid specified, choosing algorithmic mapping\n");
-               rid = pdb_gid_to_group_rid(gid);
+               d_printf("No rid or sid specified, choosing a RID\n");
+               if (pdb_rid_algorithm()) {
+                       rid = pdb_gid_to_group_rid(gid);
+               } else {
+                       if (!pdb_new_rid(&rid)) {
+                               d_printf("Could not get new RID\n");
+                       }
+               }
+               d_printf("Got RID %d\n", rid);
        }
 
        /* append the rid to our own domain/machine SID if we don't have a full SID */
@@ -423,7 +440,7 @@ static int net_groupmap_modify(int argc, const char **argv)
                map.gid = gid;
        }
 
-       if ( !pdb_update_group_mapping_entry(&map) ) {
+       if ( !NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map)) ) {
                d_fprintf(stderr, "Could not update group database\n");
                return -1;
        }
@@ -548,7 +565,7 @@ static int net_groupmap_set(int argc, const char **argv)
                fstrcpy(map.nt_name, ntgroup);
                fstrcpy(map.comment, "");
 
-               if (!pdb_add_group_mapping_entry(&map)) {
+               if (!NT_STATUS_IS_OK(pdb_add_group_mapping_entry(&map))) {
                        d_fprintf(stderr, "Could not add mapping entry for %s\n",
                                 ntgroup);
                        return -1;
@@ -582,7 +599,7 @@ static int net_groupmap_set(int argc, const char **argv)
        if (grp != NULL)
                map.gid = grp->gr_gid;
 
-       if (!pdb_update_group_mapping_entry(&map)) {
+       if (!NT_STATUS_IS_OK(pdb_update_group_mapping_entry(&map))) {
                d_fprintf(stderr, "Could not update group mapping for %s\n", ntgroup);
                return -1;
        }
@@ -633,7 +650,7 @@ static int net_groupmap_addmem(int argc, const char **argv)
                return -1;
        }
 
-       if (!pdb_add_aliasmem(&alias, &member)) {
+       if (!NT_STATUS_IS_OK(pdb_add_aliasmem(&alias, &member))) {
                d_fprintf(stderr, "Could not add sid %s to alias %s\n",
                         argv[1], argv[0]);
                return -1;
@@ -653,7 +670,7 @@ static int net_groupmap_delmem(int argc, const char **argv)
                return -1;
        }
 
-       if (!pdb_del_aliasmem(&alias, &member)) {
+       if (!NT_STATUS_IS_OK(pdb_del_aliasmem(&alias, &member))) {
                d_fprintf(stderr, "Could not delete sid %s from alias %s\n",
                         argv[1], argv[0]);
                return -1;
@@ -677,7 +694,7 @@ static int net_groupmap_listmem(int argc, const char **argv)
        members = NULL;
        num = 0;
 
-       if (!pdb_enum_aliasmem(&alias, &members, &num)) {
+       if (!NT_STATUS_IS_OK(pdb_enum_aliasmem(&alias, &members, &num))) {
                d_fprintf(stderr, "Could not list members for sid %s\n", argv[0]);
                return -1;
        }
@@ -701,8 +718,9 @@ static BOOL print_alias_memberships(TALLOC_CTX *mem_ctx,
        alias_rids = NULL;
        num_alias_rids = 0;
 
-       if (!pdb_enum_alias_memberships(mem_ctx, domain_sid, member, 1,
-                                       &alias_rids, &num_alias_rids)) {
+       if (!NT_STATUS_IS_OK(pdb_enum_alias_memberships(
+                                    mem_ctx, domain_sid, member, 1,
+                                    &alias_rids, &num_alias_rids))) {
                d_fprintf(stderr, "Could not list memberships for sid %s\n",
                         sid_string_static(member));
                return False;