diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-13 22:46:09 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:56 +0100 |
| commit | d891c0c74a03d797aed1c5ac0329fd9d1d78da63 (patch) | |
| tree | 65d0966014ca2bcded71ece2319a7723b03c4d3d /source4/lib/policy | |
| parent | 8f687a5faeaf779e88c54bea4f886eb8f410d448 (diff) | |
| download | samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.tar.gz samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.tar.bz2 samba-d891c0c74a03d797aed1c5ac0329fd9d1d78da63.zip | |
r26429: Avoid use of global_smb_iconv_convenience.
(This used to be commit d37136b7abfbba75ef2e5ab855eb3382b9648b8c)
Diffstat (limited to 'source4/lib/policy')
| -rw-r--r-- | source4/lib/policy/lex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/lib/policy/lex.c b/source4/lib/policy/lex.c index 5364706fc4..c2899aa808 100644 --- a/source4/lib/policy/lex.c +++ b/source4/lib/policy/lex.c @@ -587,6 +587,7 @@ char *yytext; #line 23 "lex.l" #include "includes.h" #include "lib/policy/parse_adm.h" +#include "param/param.h" void error_message (const char *format, ...); int yyparse (void); @@ -600,7 +601,7 @@ static bool utf16 = false; if (fread(&v, 2, 1, yyin) < 1) \ result = YY_NULL; \ else \ - result = push_codepoint(global_smb_iconv_convenience, buf, v); \ + result = push_codepoint(lp_iconv_convenience(global_loadparm), buf, v); \ } else { \ int c = getc(yyin); \ result = (c == EOF) ? YY_NULL : (buf[0] = c, 1); \ |