From: Stefan Metzmacher Date: Fri, 28 Aug 2020 14:28:41 +0000 (+0200) Subject: s3:share_mode_lock: remove unused reproducer for bug #14428 X-Git-Tag: talloc-2.3.2~675 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b02f1d676f6e62a0a4b33b9b08f8f51a68b561ca;p=thirdparty%2Fsamba.git s3:share_mode_lock: remove unused reproducer for bug #14428 BUG: https://bugzilla.samba.org/show_bug.cgi?id=14428 Signed-off-by: Stefan Metzmacher Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Mon Aug 31 13:34:17 UTC 2020 on sn-devel-184 --- diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c index 6588f09b285..1c4d3a42221 100644 --- a/source3/locking/share_mode_lock.c +++ b/source3/locking/share_mode_lock.c @@ -1783,20 +1783,6 @@ bool share_mode_cleanup_disconnected(struct file_id fid, goto done; } - /* - * This is a temporary reproducer for the origin of - * https://bugzilla.samba.org/show_bug.cgi?id=14428 - * "PANIC: assert failed in get_lease_type()" - * - * This will be removed again once the bug is demonstrated - * and fixed. - */ - TALLOC_FREE(state.lck); - state.lck = get_existing_share_mode_lock(frame, fid); - if (state.lck != NULL) { - DBG_ERR("Reproduced BUG#14428\n"); - } - ret = true; done: talloc_free(frame); diff --git a/source3/script/tests/test_durable_handle_reconnect.sh b/source3/script/tests/test_durable_handle_reconnect.sh index 66a35f08f17..2f6b308eebe 100755 --- a/source3/script/tests/test_durable_handle_reconnect.sh +++ b/source3/script/tests/test_durable_handle_reconnect.sh @@ -23,20 +23,12 @@ if [ $SMBD_DONT_LOG_STDOUT -eq 1 ]; then SMBD_LOG_FILES="$SMBD_LOG_FILES $_SMBD_LOG_FILE" fi -bug_count_0=$(grep 'Reproduced BUG#14428' $SMBD_LOG_FILES | wc -l) - testit "durable_v2_delay.durable_v2_reconnect_delay_msec" $VALGRIND \ $BINDIR/smbtorture //$SERVER_IP/durable \ -U$USERNAME%$PASSWORD \ smb2.durable-v2-delay.durable_v2_reconnect_delay_msec || failed=$(expr $failed + 1) -bug_count_1=$(grep 'Reproduced BUG#14428' $SMBD_LOG_FILES | wc -l) - -testit "bug.14428 bug_count_0[$bug_count_0] bug_count_1[$bug_count_1]" \ - test $bug_count_0 -eq $bug_count_1 || - failed=$(expr $failed + 1) - rm $delay_inject_conf testok $0 $failed