diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-28 01:17:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:25 -0500 |
| commit | 37d53832a4623653f706e77985a79d84bd7c6694 (patch) | |
| tree | 265e308027d6641bbdb29a4feddbe86ef8b25fd1 /source4/nbt_server/register.c | |
| parent | e09226cb35d627affddc08c4a88527184b8ffcf9 (diff) | |
| download | samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.gz samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.bz2 samba-37d53832a4623653f706e77985a79d84bd7c6694.zip | |
r25398: Parse loadparm context to all lp_*() functions.
(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)
Diffstat (limited to 'source4/nbt_server/register.c')
| -rw-r--r-- | source4/nbt_server/register.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source4/nbt_server/register.c b/source4/nbt_server/register.c index af067d071c..cb831f3443 100644 --- a/source4/nbt_server/register.c +++ b/source4/nbt_server/register.c @@ -170,7 +170,7 @@ static void nbtd_register_name_iface(struct nbtd_interface *iface, uint16_t nb_flags) { struct nbtd_iface_name *iname; - const char *scope = lp_netbios_scope(); + const char *scope = lp_netbios_scope(global_loadparm); struct nbt_name_register_bcast io; struct composite_context *creq; struct nbtd_server *nbtsrv = iface->nbtsrv; @@ -260,29 +260,29 @@ void nbtd_register_names(struct nbtd_server *nbtsrv) /* note that we don't initially mark the names "ACTIVE". They are marked active once registration is successful */ - nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_CLIENT, nb_flags); - nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_USER, nb_flags); - nbtd_register_name(nbtsrv, lp_netbios_name(), NBT_NAME_SERVER, nb_flags); + nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_CLIENT, nb_flags); + nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_USER, nb_flags); + nbtd_register_name(nbtsrv, lp_netbios_name(global_loadparm), NBT_NAME_SERVER, nb_flags); - aliases = lp_netbios_aliases(); + aliases = lp_netbios_aliases(global_loadparm); while (aliases && aliases[0]) { nbtd_register_name(nbtsrv, aliases[0], NBT_NAME_CLIENT, nb_flags); nbtd_register_name(nbtsrv, aliases[0], NBT_NAME_SERVER, nb_flags); aliases++; } - if (lp_server_role() == ROLE_DOMAIN_CONTROLLER) { - BOOL is_pdc = samdb_is_pdc(nbtsrv->sam_ctx); + if (lp_server_role(global_loadparm) == ROLE_DOMAIN_CONTROLLER) { + bool is_pdc = samdb_is_pdc(nbtsrv->sam_ctx); if (is_pdc) { - nbtd_register_name(nbtsrv, lp_workgroup(), + nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm), NBT_NAME_PDC, nb_flags); } - nbtd_register_name(nbtsrv, lp_workgroup(), + nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm), NBT_NAME_LOGON, nb_flags | NBT_NM_GROUP); } nb_flags |= NBT_NM_GROUP; - nbtd_register_name(nbtsrv, lp_workgroup(), NBT_NAME_CLIENT, nb_flags); + nbtd_register_name(nbtsrv, lp_workgroup(global_loadparm), NBT_NAME_CLIENT, nb_flags); nb_flags |= NBT_NM_PERMANENT; nbtd_register_name(nbtsrv, "__SAMBA__", NBT_NAME_CLIENT, nb_flags); |