From ff36c52d8c7f146eca9c6c678456708a8e2efbab Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Nov 2008 16:07:28 +0100 Subject: Remove another use of global_loadparm. Eventually, we should move some of these parameters into a separate struct (perhaps into smb_transport_options?), to avoid the long lists of parameters. --- source3/include/includes.h | 1 + source3/librpc/ndr/util.c | 1 + 2 files changed, 2 insertions(+) (limited to 'source3') diff --git a/source3/include/includes.h b/source3/include/includes.h index 73600e379b..ece819938f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -567,6 +567,7 @@ typedef char fstring[FSTRING_LEN]; #endif /* Samba 3 doesn't use iconv_convenience: */ +extern void *global_iconv_convenience; extern void *global_loadparm; extern void *cmdline_lp_ctx; struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx); diff --git a/source3/librpc/ndr/util.c b/source3/librpc/ndr/util.c index 457615ce22..c1134db8e3 100644 --- a/source3/librpc/ndr/util.c +++ b/source3/librpc/ndr/util.c @@ -166,6 +166,7 @@ _PUBLIC_ void ndr_print_sockaddr_storage(struct ndr_print *ndr, const char *name ndr->print(ndr, "%-25s: %s", name, print_sockaddr(addr, sizeof(addr), ss)); } +void *global_iconv_convenience; void *global_loadparm; void *cmdline_lp_ctx; struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx) -- cgit