summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2014-03-28 14:35:21 +1300
committerAndrew Bartlett <abartlet@samba.org>2014-04-29 05:28:39 +0200
commit77b04f1df6bb916fcf07d92e22b837e131d09034 (patch)
treebb61e44b8358a6d4c4e83328cfb189110bbc5065 /source3
parent086c06e361962e1c118d8eed2316e9df7834ae8b (diff)
winbind: Allow winbindd to be run from inside "samba"
Change-Id: I6b90a9b62ba5821e0feedb23cd20642078ba0ca6 Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: Kamen Mazdrashki <kamenim@samba.org> Autobuild-User(master): Andrew Bartlett <abartlet@samba.org> Autobuild-Date(master): Tue Apr 29 05:28:39 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 937f68db1c..a1647c947f 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1460,7 +1460,8 @@ int main(int argc, const char **argv)
*/
dump_core_setup("winbindd", lp_logfile(talloc_tos()));
- if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC) {
+ if (lp_server_role() == ROLE_ACTIVE_DIRECTORY_DC
+ && !lp_parm_bool(-1, "server role check", "inhibit", false)) {
DEBUG(0, ("server role = 'active directory domain controller' not compatible with running the winbindd binary. \n"));
DEBUGADD(0, ("You should start 'samba' instead, and it will control starting the internal AD DC winbindd implementation, which is not the same as this one\n"));
exit(1);