lib/param: Create a seperate server role for "active directory domain controller"

[kai/samba-autobuild/.git] / source4 / winbind / wb_server.c

diff --git a/source4/winbind/wb_server.c b/source4/winbind/wb_server.c
index 7bed235ae6bc25e15343280a242cadf1f5e22639..a904470e1936cac5da5f1685cac51327a55b1c56 100644 (file)
--- a/source4/winbind/wb_server.c
+++ b/source4/winbind/wb_server.c
@@ -264,8 +264,7 @@ static void winbind_task_init(struct task_server *task)
                        return;
                }
                break;
-       case ROLE_DOMAIN_CONTROLLER:
-       case ROLE_DOMAIN_PDC:
+       case ROLE_ACTIVE_DIRECTORY_DC:
                primary_sid = secrets_get_domain_sid(service,
                                                     service->task->lp_ctx,
                                                     lpcfg_workgroup(service->task->lp_ctx),
@@ -279,6 +278,10 @@ static void winbind_task_init(struct task_server *task)
                        return;
                }
                break;
+       case ROLE_DOMAIN_PDC:
+       case ROLE_DOMAIN_BDC:
+               task_server_terminate(task, "Cannot start 'samba' winbindd as a 'classic samba' DC: use winbindd instead", true);
+               return;
        }
        service->primary_sid = primary_sid;