summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2003-05-22 18:56:48 +0000
committerJeremy Allison <jra@samba.org>2003-05-22 18:56:48 +0000
commitde55b9ddb08fb9680a499f5904c9c0909161abc5 (patch)
tree220faf117cc2d0a2fe9ea0ad8a739855e5b0cddf
parent79315aabf46840f7eeb2eaa2f7f91db4b99904bb (diff)
downloadsamba-de55b9ddb08fb9680a499f5904c9c0909161abc5.tar.gz
samba-de55b9ddb08fb9680a499f5904c9c0909161abc5.tar.bz2
samba-de55b9ddb08fb9680a499f5904c9c0909161abc5.zip
More fixes for debug log to catch logic error.
Jeremy. (This used to be commit 0e2a47c1e6c0c7c41d5754be51848ef829a0324d)
-rw-r--r--source3/locking/locking.c2
-rw-r--r--source3/smbd/open.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 1b40187ac4..1a5757f817 100644
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -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;
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 906c4b40d9..510b28172d 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -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
/*