summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2009-08-22 17:13:09 +0200
committerVolker Lendecke <vl@samba.org>2009-08-23 10:19:32 +0200
commit963419be1bdc7e4ae97e8739da305691109a13a7 (patch)
tree18efc55c3d8feda5103e59c77a5d1b53948a68a6
parentfc3d427af8bba3b6d11ba6f66b48533ae918d675 (diff)
downloadsamba-963419be1bdc7e4ae97e8739da305691109a13a7.tar.gz
samba-963419be1bdc7e4ae97e8739da305691109a13a7.tar.bz2
samba-963419be1bdc7e4ae97e8739da305691109a13a7.zip
s3:winbind: For internal domains it is pointless to connect to a DC
-rw-r--r--source3/winbindd/winbindd_cm.c6
-rw-r--r--source3/winbindd/winbindd_util.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 460c7738b3..44924a6303 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -485,6 +485,12 @@ void set_domain_online_request(struct winbindd_domain *domain)
return;
}
+ if (domain->internal) {
+ DEBUG(10, ("set_domain_online_request: Internal domains are "
+ "always online\n"));
+ return;
+ }
+
/* We've been told it's safe to go online and
try and connect to a DC. But I don't believe it
because network manager seems to lie.
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c
index 993ef54f5d..9f853be32a 100644
--- a/source3/winbindd/winbindd_util.c
+++ b/source3/winbindd/winbindd_util.c
@@ -569,7 +569,11 @@ enum winbindd_result winbindd_dual_init_connection(struct winbindd_domain *domai
fstrcpy(domain->dcname, state->request->data.init_conn.dcname);
}
- init_dc_connection(domain);
+ if (domain->internal) {
+ domain->initialized = true;
+ } else {
+ init_dc_connection(domain);
+ }
if (!domain->initialized) {
/* If we return error here we can't do any cached authentication,