diff options
author | Volker Lendecke <vlendec@samba.org> | 2006-08-09 15:25:26 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:36 -0500 |
commit | 76362d0d33892df39c0a370f1f64c8581daaf166 (patch) | |
tree | 51f1e234094cb160427d02e6d4e87e46dd602f8e /source3/utils | |
parent | d802774e02ed4a68d61b9fa3b95164221dd50112 (diff) | |
download | samba-76362d0d33892df39c0a370f1f64c8581daaf166.tar.gz samba-76362d0d33892df39c0a370f1f64c8581daaf166.tar.bz2 samba-76362d0d33892df39c0a370f1f64c8581daaf166.zip |
r17468: To minimize the diff later on, pre-commit some changes independently: Change
internal mapping.c functions to return NTSTATUS instead of BOOL.
Volker
(This used to be commit 4ebfc30a28a6f48613098176c5acdfdafbd2941a)
Diffstat (limited to 'source3/utils')
-rw-r--r-- | source3/utils/net_groupmap.c | 6 | ||||
-rw-r--r-- | source3/utils/net_rpc_samsync.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/utils/net_groupmap.c b/source3/utils/net_groupmap.c index fc16bb8e49..86bec385e7 100644 --- a/source3/utils/net_groupmap.c +++ b/source3/utils/net_groupmap.c @@ -163,7 +163,7 @@ static int net_groupmap_list(int argc, const char **argv) else { GROUP_MAP *map=NULL; /* enumerate all group mappings */ - if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, ENUM_ALL_MAPPED)) + if (!NT_STATUS_IS_OK(pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, ENUM_ALL_MAPPED))) return -1; for (i=0; i<entries; i++) { @@ -612,8 +612,8 @@ static int net_groupmap_cleanup(int argc, const char **argv) GROUP_MAP *map = NULL; size_t i, entries; - if (!pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, - ENUM_ALL_MAPPED)) { + if (!NT_STATUS_IS_OK(pdb_enum_group_mapping(NULL, SID_NAME_UNKNOWN, &map, &entries, + ENUM_ALL_MAPPED))) { d_fprintf(stderr, "Could not list group mappings\n"); return -1; } diff --git a/source3/utils/net_rpc_samsync.c b/source3/utils/net_rpc_samsync.c index 09c6f4c775..7cf3bb6e1d 100644 --- a/source3/utils/net_rpc_samsync.c +++ b/source3/utils/net_rpc_samsync.c @@ -689,7 +689,7 @@ static NTSTATUS fetch_group_mem_info(uint32 rid, SAM_GROUP_MEM_INFO *delta) sid_copy(&group_sid, get_global_sam_sid()); sid_append_rid(&group_sid, rid); - if (!get_domain_group_from_sid(&group_sid, &map)) { + if (!NT_STATUS_IS_OK(get_domain_group_from_sid(&group_sid, &map))) { DEBUG(0, ("Could not find global group %d\n", rid)); return NT_STATUS_NO_SUCH_GROUP; } |