summaryrefslogtreecommitdiffstats
path: root/source3/include
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/include
parent8822b3b6628e82ce85cb20d2bbbe2d0664b9aa8f (diff)
downloadsamba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.gz
samba-cf9bd1d9ed6db5d35d92816382edbadc217de792.tar.xz
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/include')
-rw-r--r--source3/include/proto.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f551c25590..769a300403 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -900,7 +900,7 @@ NTSTATUS internal_resolve_name(const char *name,
const char *sitename,
struct ip_service **return_iplist,
int *return_count,
- const char *resolve_order);
+ const char **resolve_order);
bool resolve_name(const char *name,
struct sockaddr_storage *return_ss,
int name_type,
@@ -1034,7 +1034,7 @@ char *lp_auto_services(TALLOC_CTX *ctx);
char *lp_passwd_program(TALLOC_CTX *ctx);
char *lp_passwd_chat(TALLOC_CTX *ctx);
const char *lp_passwordserver(void);
-const char *lp_name_resolve_order(void);
+const char **lp_name_resolve_order(void);
const char *lp_netbios_scope(void);
const char *lp_netbios_name(void);
const char *lp_workgroup(void);
@@ -1472,7 +1472,6 @@ bool lp_preferred_master(void);
void lp_remove_service(int snum);
void lp_copy_service(int snum, const char *new_name);
int lp_default_server_announce(void);
-void lp_set_name_resolve_order(const char *new_order);
const char *lp_printername(TALLOC_CTX *ctx, int snum);
void lp_set_logfile(const char *name);
int lp_maxprintjobs(int snum);