diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-06-10 22:08:20 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-06-15 09:18:33 +0200 |
| commit | b8815dc23d36468cce9b615335ed62f119eb8f35 (patch) | |
| tree | f98b02f81e3fce8fbedadecf7f847e90bf40f4fa /source4/nbt_server | |
| parent | b9a75d8438470065633c1ff69c653eaa799d5718 (diff) | |
| download | samba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.gz samba-b8815dc23d36468cce9b615335ed62f119eb8f35.tar.bz2 samba-b8815dc23d36468cce9b615335ed62f119eb8f35.zip | |
lib/param: Create a seperate server role for "active directory domain controller"
This will allow us to detect from the smb.conf if this is a Samba4 AD
DC which will allow smarter handling of (for example) accidentially
starting smbd rather than samba.
To cope with upgrades from existing Samba4 installs, 'domain
controller' is a synonym of 'active directory domain controller' and
new parameters 'classic primary domain controller' and 'classic backup
domain controller' are added.
Andrew Bartlett
Diffstat (limited to 'source4/nbt_server')
| -rw-r--r-- | source4/nbt_server/dgram/netlogon.c | 2 | ||||
| -rw-r--r-- | source4/nbt_server/register.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index f99f195d03..3f0fa542fe 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -54,7 +54,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, samctx = iface->nbtsrv->sam_ctx; - if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_DOMAIN_CONTROLLER + if (lpcfg_server_role(iface->nbtsrv->task->lp_ctx) != ROLE_ACTIVE_DIRECTORY_DC || !samdb_is_pdc(samctx)) { DEBUG(2, ("Not a PDC, so not processing LOGON_PRIMARY_QUERY\n")); return; diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c index fb2f9913c5..f5517b249a 100644 --- a/source4/nbt_server/register.c +++ b/source4/nbt_server/register.c @@ -289,7 +289,7 @@ void nbtd_register_names(struct nbtd_server *nbtsrv) aliases++; } - if (lpcfg_server_role(nbtsrv->task->lp_ctx) == ROLE_DOMAIN_CONTROLLER) { + if (lpcfg_server_role(nbtsrv->task->lp_ctx) == ROLE_ACTIVE_DIRECTORY_DC) { bool is_pdc = samdb_is_pdc(nbtsrv->sam_ctx); if (is_pdc) { nbtd_register_name(nbtsrv, lpcfg_workgroup(nbtsrv->task->lp_ctx), |