sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-07 01:58:28 +03:00
Code

More fixes for debug log to catch logic error.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison -
parent 689576c242
commit 0e2a47c1e6
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/locking/locking.c
View File

@ -375,7 +375,7 @@ void unlock_share_entry_fsp(files_struct *fsp)
Print out a share mode.
********************************************************************/
static char *share_mode_str(int num, share_mode_entry *e)
char *share_mode_str(int num, share_mode_entry *e)
{
static pstring share_str;

6
source/smbd/open.c
View File

@ -534,7 +534,7 @@ existing desired access (0x%x).\n", fname, (unsigned int)desired_access, (unsign
#if defined(DEVELOPER)
static void validate_my_share_entries(share_mode_entry *share_entry)
static void validate_my_share_entries(int num, share_mode_entry *share_entry)
{
files_struct *fsp;
@ -543,11 +543,13 @@ static void validate_my_share_entries(share_mode_entry *share_entry)
fsp = file_find_dif(share_entry->dev, share_entry->inode, share_entry->share_file_id);
if (!fsp) {
DEBUG(0,("validate_my_share_entries: PANIC : %s\n", share_mode_str(num, share_entry) ));
smb_panic("validate_my_share_entries: Cannot match a share entry with an open file\n");
}
if (((uint16)fsp->oplock_type) != share_entry->op_type) {
pstring str;
DEBUG(0,("validate_my_share_entries: PANIC : %s\n", share_mode_str(num, share_entry) ));
slprintf(str, sizeof(str)-1, "validate_my_share_entries: file %s, oplock_type = 0x%x, op_type = 0x%x\n",
fsp->fsp_name, (unsigned int)fsp->oplock_type, (unsigned int)share_entry->op_type );
smb_panic(str);
@ -596,7 +598,7 @@ static int open_mode_check(connection_struct *conn, const char *fname, SMB_DEV_T
share_mode_entry *share_entry = &old_shares[i];
#if defined(DEVELOPER)
validate_my_share_entries(share_entry);
validate_my_share_entries(i, share_entry);
#endif
/*