sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3-winbindd: Honour pdb_is_responsible_for_everything_else()

Browse Source 
This allows us to avoid running idmap_init_default_domain() which
gives an error in the default AD DC config.

Andrew Bartlett

Change-Id: I923bd941951f6a907e6fa1ad167e5218a01040ff
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Kamen Mazdrashki <kamenim@samba.org>
This commit is contained in:
Andrew Bartlett 2014-03-28 15:37:19 +13:00
parent b359b0c160
commit ad533709e5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source3/winbindd/idmap.c
View File

@ -25,6 +25,7 @@
#include "winbindd.h"
#include "idmap.h"
#include "lib/util_sid_passdb.h"
#include "passdb.h"
#undef DBGC_CLASS
#define DBGC_CLASS DBGC_IDMAP
@ -330,14 +331,16 @@ static struct idmap_domain *idmap_passdb_domain(TALLOC_CTX *mem_ctx)
{
idmap_init();
/*
* Always init the default domain, we can't go without one
*/
if (default_idmap_domain == NULL) {
default_idmap_domain = idmap_init_default_domain(NULL);
}
if (default_idmap_domain == NULL) {
return NULL;
if (!pdb_is_responsible_for_everything_else()) {
/*
* Always init the default domain, we can't go without one
*/
if (default_idmap_domain == NULL) {
default_idmap_domain = idmap_init_default_domain(NULL);
}
if (default_idmap_domain == NULL) {
return NULL;
}
}
if (passdb_idmap_domain != NULL) {