diff options
| author | Volker Lendecke <vl@samba.org> | 2008-07-29 09:04:17 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-08-12 11:28:29 +0200 |
| commit | a93d0f6f4e40c0130f8e14eaa555cdbbccce825e (patch) | |
| tree | 0bdd2e2be08ac7b7c3e97c60b6edcc6febc21097 /source3 | |
| parent | b87807d0321f3c73fa611a5ee751a9ae741db0fb (diff) | |
| download | samba-a93d0f6f4e40c0130f8e14eaa555cdbbccce825e.tar.gz samba-a93d0f6f4e40c0130f8e14eaa555cdbbccce825e.tar.bz2 samba-a93d0f6f4e40c0130f8e14eaa555cdbbccce825e.zip | |
Do not create a new mapping if a domain with an explicit config fails
(This used to be commit 2c27de44269198e22c323191dd4762d1aab81b22)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/winbindd/idmap_util.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/source3/winbindd/idmap_util.c b/source3/winbindd/idmap_util.c index 04d12944e2..2a6beca5a2 100644 --- a/source3/winbindd/idmap_util.c +++ b/source3/winbindd/idmap_util.c @@ -174,6 +174,15 @@ backend: goto done; } + if (dom_name[0] != '\0') { + /* + * We had the task to go to a specific domain which + * could not answer our request. Fail. + */ + idmap_cache_set_sid2uid(sid, -1); + return NT_STATUS_NONE_MAPPED; + } + ret = idmap_new_mapping(sid, ID_TYPE_UID, &map.xid); if (!NT_STATUS_IS_OK(ret)) { @@ -236,6 +245,15 @@ backend: goto done; } + if (domname[0] != '\0') { + /* + * We had the task to go to a specific domain which + * could not answer our request. Fail. + */ + 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)) { |