The branch, master has been updated via 29a51a2 s3: Avoid a lot of calls to serverid_exists() from eaf9b86 Revert "waf-mitkrb5: enable dcerpc_server library to support OpenChange client code"
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 29a51a22df68ae8929bd8312df03c72bbfa26f81 Author: Volker Lendecke <v...@samba.org> Date: Fri Jun 1 15:15:07 2012 +0200 s3: Avoid a lot of calls to serverid_exists() Signed-off-by: Stefan Metzmacher <me...@samba.org> Autobuild-User: Stefan Metzmacher <me...@samba.org> Autobuild-Date: Fri Jun 1 18:58:30 CEST 2012 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: source3/locking/locking.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/locking/locking.c b/source3/locking/locking.c index 00a46fa..76c2bc7 100644 --- a/source3/locking/locking.c +++ b/source3/locking/locking.c @@ -620,7 +620,7 @@ 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); - if (serverid_exists(&e->pid) && (num_props > 1)) { + if ((num_props > 1) && serverid_exists(&e->pid)) { smb_panic("Invalid share mode entry"); } return (num_props != 0); -- Samba Shared Repository