summaryrefslogtreecommitdiff
path: root/source3/winbindd/winbindd_dual.c
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2008-02-01 13:50:04 -0500
committerSimo Sorce <idra@samba.org>2008-02-01 14:23:43 -0500
commit93a3c5b3f9927973b4ad1496f593ea147052d1e1 (patch)
tree4b2cf7270651d693d088e8ad07822d58b74772f8 /source3/winbindd/winbindd_dual.c
parent9f5a16a22da812ed58dcb46979ab5ae27d3a905e (diff)
downloadsamba-93a3c5b3f9927973b4ad1496f593ea147052d1e1.tar.gz
samba-93a3c5b3f9927973b4ad1496f593ea147052d1e1.tar.bz2
samba-93a3c5b3f9927973b4ad1496f593ea147052d1e1.zip
Fix winbindd running on a Samba DC,
This patch make sure we do not try to contact smbd in the main dameon to avoid deadlocks. All the operations that require connecting to smbd are performed in the domain child anyway. (This used to be commit 9347d34b502bef70cdae8f3e8acd9796dba49581)
Diffstat (limited to 'source3/winbindd/winbindd_dual.c')
-rw-r--r--source3/winbindd/winbindd_dual.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 778886d8e2..2739ab542e 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -34,6 +34,7 @@
#define DBGC_CLASS DBGC_WINBIND
extern bool override_logfile;
+extern struct winbindd_methods cache_methods;
/* Read some data from a client connection */
@@ -991,6 +992,16 @@ static bool fork_domain_child(struct winbindd_child *child)
child);
}
+ /* Special case for Winbindd on a Samba DC,
+ * We want to make sure the child can connect to smbd
+ * but not the main daemon */
+
+ if (child->domain && child->domain->internal && IS_DC) {
+ child->domain->internal = False;
+ child->domain->methods = &cache_methods;
+ child->domain->online = False;
+ }
+
while (1) {
int ret;