summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-08 21:45:02 +0100
committerVolker Lendecke <vl@samba.org>2011-03-18 15:46:36 +0100
commit6ba85beeec7ab11baba548c7443e904d9ea31944 (patch)
treefe78e08da98e6deed0cea5028437d7c5a7a162d7
parent6ab0d8b9981e9e2ab07993069139ec8f9fca9696 (diff)
downloadsamba-6ba85beeec7ab11baba548c7443e904d9ea31944.tar.gz
samba-6ba85beeec7ab11baba548c7443e904d9ea31944.tar.bz2
samba-6ba85beeec7ab11baba548c7443e904d9ea31944.zip
idmap-autorid: Remove an else branch
Signed-off-by: Christian Ambach <christian.ambach@de.ibm.com>
-rw-r--r--source3/winbindd/idmap_autorid.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/source3/winbindd/idmap_autorid.c b/source3/winbindd/idmap_autorid.c
index 9fd7f15095..5747a0b0c8 100644
--- a/source3/winbindd/idmap_autorid.c
+++ b/source3/winbindd/idmap_autorid.c
@@ -168,19 +168,20 @@ static NTSTATUS idmap_autorid_id_to_sid(TALLOC_CTX * memctx,
DEBUG(4, ("id %d belongs to range %d which does not have "
"domain mapping, ignoring mapping request\n",
map->xid.id, range));
- } else {
- string_to_sid(&sid, (const char *)data.dptr);
+ return NT_STATUS_OK;
+ }
- sid_compose(map->sid, &sid,
- (map->xid.id - cfg->minvalue -
- range * cfg->rangesize));
+ string_to_sid(&sid, (const char *)data.dptr);
- /* We **really** should have some way of validating
- the SID exists and is the correct type here. But
- that is a deficiency in the idmap_rid design. */
+ sid_compose(map->sid, &sid,
+ (map->xid.id - cfg->minvalue -
+ range * cfg->rangesize));
- map->status = ID_MAPPED;
- }
+ /* We **really** should have some way of validating
+ the SID exists and is the correct type here. But
+ that is a deficiency in the idmap_rid design. */
+
+ map->status = ID_MAPPED;
return NT_STATUS_OK;
}