summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2012-07-18 15:19:15 +1000
committerAndrew Bartlett <abartlet@samba.org>2012-07-19 08:02:32 +0200
commitcf9bd1d9ed6db5d35d92816382edbadc217de792 (patch)
tree9643306455b8788b6de6cdd94e682b98a91b3c73 /source3/param
parent8822b3b6628e82ce85cb20d2bbbe2d0664b9aa8f (diff)
downloadsamba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.gz
samba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.bz2
samba-cf9bd1d9ed6db5d35d92816382edbadc217de792.zip
s3-param: Make lp_name_resolve_order() return a list
This allows this parameter, one of the few with differing declarations between the loadparm systems, to be brought into common. Andrew Bartlett Pair-Programmed-With: Andrew Tridgell <tridge@samba.org>
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 5486b0a92f..4c21d5032f 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -1749,7 +1749,7 @@ static struct parm_struct parm_table[] = {
},
{
.label = "name resolve order",
- .type = P_STRING,
+ .type = P_LIST,
.p_class = P_GLOBAL,
.offset = GLOBAL_VAR(szNameResolveOrder),
.special = NULL,
@@ -4730,7 +4730,7 @@ static void init_globals(bool reinit_globals)
string_set(&Globals.szLogonHome, "\\\\%N\\%U");
string_set(&Globals.szLogonPath, "\\\\%N\\%U\\profile");
- string_set(&Globals.szNameResolveOrder, "lmhosts wins host bcast");
+ Globals.szNameResolveOrder = (const char **)str_list_make_v3(NULL, "lmhosts wins host bcast", NULL);
string_set(&Globals.szPasswordServer, "*");
Globals.AlgorithmicRidBase = BASE_RID;
@@ -5109,7 +5109,6 @@ int lp_cups_encrypt(void)
/* These functions remain in source3/param for now */
-FN_GLOBAL_CONST_STRING(name_resolve_order, szNameResolveOrder)
FN_GLOBAL_CONST_STRING(smb_ports, smb_ports)
FN_GLOBAL_INTEGER(security, security)
FN_GLOBAL_INTEGER(usershare_max_shares, iUsershareMaxShares)
@@ -9149,16 +9148,6 @@ void lp_copy_service(int snum, const char *new_name)
}
}
-
-/***********************************************************
- Set the global name resolution order (used in smbclient).
-************************************************************/
-
-void lp_set_name_resolve_order(const char *new_order)
-{
- string_set(&Globals.szNameResolveOrder, new_order);
-}
-
const char *lp_printername(TALLOC_CTX *ctx, int snum)
{
const char *ret = lp__printername(talloc_tos(), snum);