From: Uri Simchoni Date: Fri, 10 Nov 2017 19:35:54 +0000 (+0200) Subject: smbd: remove calls to dptr_init_search_op() from TRANS2 search code X-Git-Tag: tevent-0.9.34~13 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8aa599f060ea6de7277b0af42659a09f4469165;p=thirdparty%2Fsamba.git smbd: remove calls to dptr_init_search_op() from TRANS2 search code dptr_init_search_op() invokes VFS operations which are no-op in all in-tree VFS modules. Furthermore, it's not being called by the SMB2 search code, so probably it's not being used by any out-of-tree VFS module either. Signed-off-by: Uri Simchoni Reviewed-by: Jeremy Allison --- diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index de6073a973f..dbad71be3b7 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -2867,9 +2867,6 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd dptr_num = dptr_dnum(dirptr); DEBUG(4,("dptr_num is %d, wcard = %s, attr = %d\n", dptr_num, mask, dirtype)); - /* Initialize per TRANS2_FIND_FIRST operation data */ - dptr_init_search_op(dirptr); - /* We don't need to check for VOL here as this is returned by a different TRANS2 call. */ @@ -3237,9 +3234,6 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd dptr_TellDir(dirptr), (int)backup_priv)); - /* Initialize per TRANS2_FIND_NEXT operation data */ - dptr_init_search_op(dirptr); - /* We don't need to check for VOL here as this is returned by a different TRANS2 call. */