summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-05-14 16:19:46 +0200
committerMichael Adam <obnox@samba.org>2010-08-14 02:10:36 +0200
commit9ee31346911bb14715704a10086214b1ddc15371 (patch)
treea27d1f04af2009445a2d1a69854871bdc8f6f0b9
parentf301ea59773b174da9009dfd482a56d7e72a76dd (diff)
downloadsamba-9ee31346911bb14715704a10086214b1ddc15371.tar.gz
samba-9ee31346911bb14715704a10086214b1ddc15371.tar.bz2
samba-9ee31346911bb14715704a10086214b1ddc15371.zip
s3:idmap: don't call idmap_new_mapping idmap_sid_to_gid
The setting of a new mapping is moved into the backend code to achieve atomicity and greater flexibility. Michael
-rw-r--r--source3/winbindd/idmap_util.c41
1 files changed, 16 insertions, 25 deletions
diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c
index 68b3250e8d..906667142e 100644
--- a/source3/winbindd/idmap_util.c
+++ b/source3/winbindd/idmap_util.c
@@ -249,45 +249,36 @@ backend:
map.xid.type = ID_TYPE_GID;
ret = idmap_backends_sid_to_unixid(domname, &map);
- if (NT_STATUS_IS_OK(ret) && (map.status == ID_MAPPED)) {
- if (map.xid.type != ID_TYPE_GID) {
- DEBUG(10, ("sid [%s] not mapped to a gid "
- "[%u,%u,%u]\n",
- sid_string_dbg(sid),
- map.status,
- map.xid.type,
- map.xid.id));
- if (winbindd_use_idmap_cache()) {
- idmap_cache_set_sid2gid(sid, -1);
- }
- return NT_STATUS_NONE_MAPPED;
+
+ if (!NT_STATUS_IS_OK(ret)) {
+ DEBUG(10, ("idmap_backends_sid_to_unixid failed: %s\n",
+ nt_errstr(ret)));
+ if (winbindd_use_idmap_cache()) {
+ idmap_cache_set_sid2uid(sid, -1);
}
- goto done;
+ return ret;
}
- if (domname[0] != '\0') {
- /*
- * We had the task to go to a specific domain which
- * could not answer our request. Fail.
- */
+ if (map.status != ID_MAPPED) {
if (winbindd_use_idmap_cache()) {
idmap_cache_set_sid2uid(sid, -1);
}
return NT_STATUS_NONE_MAPPED;
}
- ret = idmap_new_mapping(sid, ID_TYPE_GID, &map.xid);
-
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(10, ("idmap_new_mapping failed: %s\n",
- nt_errstr(ret)));
+ if (map.xid.type != ID_TYPE_GID) {
+ DEBUG(10, ("sid [%s] not mapped to a gid "
+ "[%u,%u,%u]\n",
+ sid_string_dbg(sid),
+ map.status,
+ map.xid.type,
+ map.xid.id));
if (winbindd_use_idmap_cache()) {
idmap_cache_set_sid2gid(sid, -1);
}
- return ret;
+ return NT_STATUS_NONE_MAPPED;
}
-done:
*gid = map.xid.id;
if (winbindd_use_idmap_cache()) {
idmap_cache_set_sid2gid(sid, *gid);