git.samba.org
/
ddiss
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
49237b0
)
s3: Be less picky on stale share mode entries
author
Volker Lendecke
<vl@samba.org>
Mon, 14 May 2012 12:57:34 +0000
(14:57 +0200)
committer
Jeremy Allison
<jra@samba.org>
Thu, 17 May 2012 20:17:22 +0000
(13:17 -0700)
If a process died, the share mode entry might be bogus. Ignore those entries.
Signed-off-by: Jeremy Allison <jra@samba.org>
source3/locking/locking.c
patch
|
blob
|
history
diff --git
a/source3/locking/locking.c
b/source3/locking/locking.c
index 69a6f26cc119606363796190dcf1436a31a4fb9b..b9fba17a87b1f47672bf2ccdf4b293199e880397 100644
(file)
--- 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);
}