summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2000-12-07 19:26:04 +0000
committerJeremy Allison <jra@samba.org>2000-12-07 19:26:04 +0000
commitcf5b71994d6cdb2f81c390579f4a0e676926c6b9 (patch)
treeee7f1164bf48be2c95651e21bb88b41ec84859f6 /source3/param
parent0d658c35eb9d8ec400ad0302ee11d489bb59bd77 (diff)
downloadsamba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.gz
samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.tar.bz2
samba-cf5b71994d6cdb2f81c390579f4a0e676926c6b9.zip
file_lines_load/file_lines_pload can now optionally convert unix_to_dos()
on read. Jeremy. (This used to be commit 76b8dd376d13eb4469417be217c966d54d333367)
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index b666cd3cf4..4a6ec83607 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2217,11 +2217,11 @@ static BOOL handle_source_env(char *pszParmValue, char **ptr)
if (*p == '|')
{
- lines = file_lines_pload(p + 1, NULL);
+ lines = file_lines_pload(p + 1, NULL, True);
}
else
{
- lines = file_lines_load(fname, NULL);
+ lines = file_lines_load(fname, NULL, True);
}
if (!lines)