summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-11-02 16:07:28 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-11-02 16:07:28 +0100
commitff36c52d8c7f146eca9c6c678456708a8e2efbab (patch)
tree8ae184942009eaef07148baf6ef7f33064555b40 /source3
parent7a0e5de08d487108c604b4bab8a2c8e689808d9f (diff)
downloadsamba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.gz
samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.tar.bz2
samba-ff36c52d8c7f146eca9c6c678456708a8e2efbab.zip
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.
Diffstat (limited to 'source3')
-rw-r--r--source3/include/includes.h1
-rw-r--r--source3/librpc/ndr/util.c1
2 files changed, 2 insertions, 0 deletions
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)