Attachment 11494 Details for Bug 11549 – git-am fix for 4.3.next, 4.2.next.

[patch] git-am fix for 4.3.next, 4.2.next.

0001-s3-locking-initialize-lease-pointer-in-share_mode_tr.patch (text/plain), 1.64 KB, created by Jeremy Allison on 2015-10-14 21:29:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2015-10-14 21:29:20 UTC

Size: 1.64 KB

patch

obsolete

>From f1d2e889d6cdf18a72e0f2c9d6b5750b9da965e0 Mon Sep 17 00:00:00 2001
>From: Ralph Boehme <slow@samba.org>
>Date: Mon, 12 Oct 2015 12:28:04 +0200
>Subject: [PATCH] s3:locking: initialize lease pointer in
> share_mode_traverse_fn()
>
>Initialize lease pointer to point to the share_mode_data leases array
>entry at index lease_idx.
>
>This fixes a bug in smbstatus where the lease info is not printed.
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=11549
>
>Signed-off-by: Ralph Boehme <slow@samba.org>
>Reviewed-by: Jeremy Allison <jra@samba.org>
>
>Autobuild-User(master): Jeremy Allison <jra@samba.org>
>Autobuild-Date(master): Tue Oct 13 01:14:09 CEST 2015 on sn-devel-104
>
>(cherry picked from commit 0ef9c67b56a0b493ed06f9a64ac2bc2233041aee)
>---
> source3/locking/share_mode_lock.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/source3/locking/share_mode_lock.c b/source3/locking/share_mode_lock.c
>index 5eedcc5..c05d65d 100644
>--- a/source3/locking/share_mode_lock.c
>+++ b/source3/locking/share_mode_lock.c
>@@ -687,13 +687,17 @@ static int share_mode_traverse_fn(struct db_record *rec, void *_state)
> 		DEBUG(1, ("ndr_pull_share_mode_lock failed\n"));
> 		return 0;
> 	}
>+
>+	for (i=0; i<d->num_share_modes; i++) {
>+		struct share_mode_entry *entry = &d->share_modes[i];
>+		entry->stale = false; /* [skip] in idl */
>+		entry->lease = &d->leases[entry->lease_idx];
>+	}
>+
> 	if (DEBUGLEVEL > 10) {
> 		DEBUG(11, ("parse_share_modes:\n"));
> 		NDR_PRINT_DEBUG(share_mode_data, d);
> 	}
>-	for (i=0; i<d->num_share_modes; i++) {
>-		d->share_modes[i].stale = false; /* [skip] in idl */
>-	}
> 
> 	ret = state->fn(fid, d, state->private_data);
> 
>-- 
>2.6.0.rc2.230.g3dd15c0
>

Flags:

slow: review+

Actions: View

Attachments on bug 11549: 11494