git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9816f15
)
s3:winbindd: never mark external domains as internal!
author
Stefan Metzmacher
<metze@samba.org>
Tue, 23 Feb 2010 07:42:41 +0000
(08:42 +0100)
committer
Karolin Seeger
<kseeger@samba.org>
Wed, 24 Feb 2010 15:25:10 +0000
(16:25 +0100)
This way we can endup with silently using builtin_passdb_methods
for an ad domain without an inbound trust.
This fixes bug #7170.
metze
(cherry picked from commit
f924b7749280b31ece19885de1c3ad1bd71942ac
)
(cherry picked from commit
40f359476d7ec3aec252f79bd2127dd08b305a9f
)
source/winbindd/winbindd_cm.c
patch
|
blob
|
history
diff --git
a/source/winbindd/winbindd_cm.c
b/source/winbindd/winbindd_cm.c
index bd502a5ece0b92e97fe5386c4badf153ef4fed65..0ca716704183cc0cd20d1ac1ab06cf90f8dadf37 100644
(file)
--- a/
source/winbindd/winbindd_cm.c
+++ b/
source/winbindd/winbindd_cm.c
@@
-1618,7
+1618,7
@@
static NTSTATUS init_dc_connection_network(struct winbindd_domain *domain)
NTSTATUS result;
/* Internal connections never use the network. */
- if (domain->internal) {
+ if (domain->internal
|| !winbindd_can_contact_domain(domain)
) {
domain->initialized = True;
return NT_STATUS_OK;
}
@@
-1746,9
+1746,6
@@
static bool set_dc_type_and_flags_trustinfo( struct winbindd_domain *domain )
domain->initialized = True;
- if ( !winbindd_can_contact_domain( domain) )
- domain->internal = True;
-
break;
}
}