From ad533709e5f98230cc3f6b79afecf2c6e057a4b8 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 28 Mar 2014 15:37:19 +1300 Subject: s3-winbindd: Honour pdb_is_responsible_for_everything_else() 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 Reviewed-by: Kamen Mazdrashki --- source3/winbindd/idmap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'source3') diff --git a/source3/winbindd/idmap.c b/source3/winbindd/idmap.c index 97a34d4bddb..674f54ced1c 100644 --- a/source3/winbindd/idmap.c +++ b/source3/winbindd/idmap.c @@ -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) { -- cgit