From: Jeremy Allison Date: Mon, 11 May 2020 22:58:27 +0000 (-0700) Subject: s3: libsmbclient: Finish unifing bad iconv behavior across CORE NT1 SMB2 protocols. X-Git-Tag: samba-4.11.10~4 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0f35dbd96c068d5d9638e2477cf0e5f6dafe8f37;p=thirdparty%2Fsamba.git s3: libsmbclient: Finish unifing bad iconv behavior across CORE NT1 SMB2 protocols. On bad name conversion, exit the directory listing with an error, but leave the connection intact. We were already checking for finfo->name == NULL here, but were ignoring it and not reporting an error. Remove the knownfail.d/bad_iconv file as we now behave the same across CORE/NT1/SMB2. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14374 Signed-off-by: Jeremy Allison Reviewed-by: Andreas Schneider Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Tue May 12 21:32:44 UTC 2020 on sn-devel-184 (cherry picked from commit 393da520e43bd3a28feb231bcd9fd5308a3daa4a) Autobuild-User(v4-11-test): Karolin Seeger Autobuild-Date(v4-11-test): Thu Jun 4 11:47:26 UTC 2020 on sn-devel-184 --- diff --git a/selftest/knownfail.d/bad_iconv b/selftest/knownfail.d/bad_iconv deleted file mode 100644 index c45022f3457..00000000000 --- a/selftest/knownfail.d/bad_iconv +++ /dev/null @@ -1,2 +0,0 @@ -samba3.blackbox.smbclient_iconv.NT1 - diff --git a/source3/libsmb/clilist.c b/source3/libsmb/clilist.c index 06a45e221f6..a14bae691b1 100644 --- a/source3/libsmb/clilist.c +++ b/source3/libsmb/clilist.c @@ -794,8 +794,9 @@ static void cli_list_trans_done(struct tevent_req *subreq) if (finfo->name == NULL) { DEBUG(1, ("cli_list: Error: unable to parse name from " "info level %d\n", state->info_level)); - ff_eos = true; - break; + tevent_req_nterror(req, + NT_STATUS_INVALID_NETWORK_RESPONSE); + return; } status = is_bad_finfo_name(state->cli, finfo);