summaryrefslogtreecommitdiff
path: root/source3/web
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-03-11 22:59:58 +0000
committerJeremy Allison <jra@samba.org>2004-03-11 22:59:58 +0000
commit39c731347045dc345862d527871ae5b9a4619e74 (patch)
tree1efcc9c3ea2080a20b4bc52bf0b08a69c161b847 /source3/web
parent77b180d401b1f431dd550a8498b83bdb24cd7325 (diff)
downloadsamba-39c731347045dc345862d527871ae5b9a4619e74.tar.gz
samba-39c731347045dc345862d527871ae5b9a4619e74.tar.bz2
samba-39c731347045dc345862d527871ae5b9a4619e74.zip
Restore the contract on all convert_stringXX() interfaces. Add a "allow_bad_conv"
boolean parameter that allows broken iconv conversions to work. Gets rid of the nasty errno checks in mangle_hash2 and check_path_syntax and allows correct return code checking. Jeremy. (This used to be commit 3b4fca7b7f410cb0f11322e22c8f26a662eff941)
Diffstat (limited to 'source3/web')
-rw-r--r--source3/web/cgi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source3/web/cgi.c b/source3/web/cgi.c
index aac009893c..07b9f52ff7 100644
--- a/source3/web/cgi.c
+++ b/source3/web/cgi.c
@@ -203,13 +203,13 @@ void cgi_load_variables(void)
convert_string(CH_DISPLAY, CH_UNIX,
variables[i].name, -1,
- dest, sizeof(dest));
+ dest, sizeof(dest), True);
free(variables[i].name);
variables[i].name = strdup(dest);
convert_string(CH_DISPLAY, CH_UNIX,
variables[i].value, -1,
- dest, sizeof(dest));
+ dest, sizeof(dest), True);
free(variables[i].value);
variables[i].value = strdup(dest);
}
@@ -336,11 +336,11 @@ static BOOL cgi_handle_authorization(char *line)
convert_string(CH_DISPLAY, CH_UNIX,
line, -1,
- user, sizeof(user));
+ user, sizeof(user), True);
convert_string(CH_DISPLAY, CH_UNIX,
p+1, -1,
- user_pass, sizeof(user_pass));
+ user_pass, sizeof(user_pass), True);
/*
* Try and get the user from the UNIX password file.