diff options
| author | Simo Sorce <idra@samba.org> | 2008-02-01 13:50:04 -0500 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2008-02-01 14:23:43 -0500 |
| commit | 93a3c5b3f9927973b4ad1496f593ea147052d1e1 (patch) | |
| tree | 4b2cf7270651d693d088e8ad07822d58b74772f8 /source3/winbindd/winbindd_util.c | |
| parent | 9f5a16a22da812ed58dcb46979ab5ae27d3a905e (diff) | |
| download | samba-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_util.c')
| -rw-r--r-- | source3/winbindd/winbindd_util.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/source3/winbindd/winbindd_util.c b/source3/winbindd/winbindd_util.c index 70468b6bcd..795209619c 100644 --- a/source3/winbindd/winbindd_util.c +++ b/source3/winbindd/winbindd_util.c @@ -82,9 +82,6 @@ static bool is_internal_domain(const DOM_SID *sid) if (sid == NULL) return False; - if ( IS_DC ) - return sid_check_is_builtin(sid); - return (sid_check_is_domain(sid) || sid_check_is_builtin(sid)); } @@ -93,9 +90,6 @@ static bool is_in_internal_domain(const DOM_SID *sid) if (sid == NULL) return False; - if ( IS_DC ) - return sid_check_is_in_builtin(sid); - return (sid_check_is_in_our_domain(sid) || sid_check_is_in_builtin(sid)); } |