From 43296090f93c48aab061c0fd4ed295a0eb64756b Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 14 May 2012 14:57:34 +0200 Subject: s3: Be less picky on stale share mode entries If a process died, the share mode entry might be bogus. Ignore those entries. Signed-off-by: Jeremy Allison --- source3/locking/locking.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 69a6f26cc1..b9fba17a87 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -620,7 +620,9 @@ bool is_valid_share_mode_entry(const struct share_mode_entry *e) num_props += (EXCLUSIVE_OPLOCK_TYPE(e->op_type) ? 1 : 0); num_props += (LEVEL_II_OPLOCK_TYPE(e->op_type) ? 1 : 0); - SMB_ASSERT(num_props <= 1); + if (serverid_exists(&e->pid) && (num_props > 1)) { + smb_panic("Invalid share mode entry"); + } return (num_props != 0); } -- cgit