From 15e84a9a09c5a86416e964a3258ee35718fbf45a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 24 Mar 2011 10:59:41 +1100 Subject: charcnv: removed the allow_badcharcnv and allow_bad_conv options to convert_string*() we shouldn't accept bad multi-byte strings, it just hides problems Autobuild-User: Andrew Tridgell Autobuild-Date: Thu Mar 24 01:47:26 CET 2011 on sn-devel-104 --- source3/web/cgi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/web/cgi.c') diff --git a/source3/web/cgi.c b/source3/web/cgi.c index e3356a2f7e..1c610dfd52 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -207,14 +207,14 @@ void cgi_load_variables(void) convert_string_talloc(frame, CH_UTF8, CH_UNIX, variables[i].name, strlen(variables[i].name), - &dest, &dest_len, True); + &dest, &dest_len); SAFE_FREE(variables[i].name); variables[i].name = SMB_STRDUP(dest ? dest : ""); dest = NULL; convert_string_talloc(frame, CH_UTF8, CH_UNIX, variables[i].value, strlen(variables[i].value), - &dest, &dest_len, True); + &dest, &dest_len); SAFE_FREE(variables[i].value); variables[i].value = SMB_STRDUP(dest ? dest : ""); TALLOC_FREE(frame); @@ -359,11 +359,11 @@ static bool cgi_handle_authorization(char *line) convert_string(CH_UTF8, CH_UNIX, line, -1, - user, sizeof(user), True); + user, sizeof(user)); convert_string(CH_UTF8, CH_UNIX, p+1, -1, - user_pass, sizeof(user_pass), True); + user_pass, sizeof(user_pass)); /* * Try and get the user from the UNIX password file. -- cgit