Attachment 7809 Details for Bug 9058 – git-am fix for 3.6.next.

[patch] git-am fix for 3.6.next.

0001-Bug-9058-Files-not-deleted-smbstatus-shows-Segmentat.patch (text/plain), 2.39 KB, created by Jeremy Allison on 2012-08-22 18:53:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2012-08-22 18:53:34 UTC

Size: 2.39 KB

patch

obsolete

>From 10c967adac50e601e9f0bae5d874923eed2d0d2d Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Wed, 22 Aug 2012 11:05:19 -0700
>Subject: [PATCH] Bug #9058] Files not deleted, smbstatus shows "Segmentation
> fault".
>
>Fix smbstatus code dump when a file entry has delete tokens.
>---
> source3/locking/locking.c |   42 ++++++++++++++++--------------------------
> 1 files changed, 16 insertions(+), 26 deletions(-)
>
>diff --git a/source3/locking/locking.c b/source3/locking/locking.c
>index 11d1a85..4379847 100644
>--- a/source3/locking/locking.c
>+++ b/source3/locking/locking.c
>@@ -1735,42 +1735,32 @@ struct forall_state {
> static int traverse_fn(struct db_record *rec, void *_state)
> {
> 	struct forall_state *state = (struct forall_state *)_state;
>-	struct locking_data *data;
>-	struct share_mode_entry *shares;
>-	const char *sharepath;
>-	const char *fname;
>-	const char *del_tokens;
>-	uint32_t total_del_token_size = 0;
> 	int i;
>+	struct share_mode_lock *lck;
> 
> 	/* Ensure this is a locking_key record. */
> 	if (rec->key.dsize != sizeof(struct file_id))
> 		return 0;
> 
>-	data = (struct locking_data *)rec->value.dptr;
>-	shares = (struct share_mode_entry *)(rec->value.dptr + sizeof(*data));
>-	del_tokens = (const char *)rec->value.dptr + sizeof(*data) +
>-		data->u.s.num_share_mode_entries*sizeof(*shares);
>-
>-	for (i = 0; i < data->u.s.num_delete_token_entries; i++) {
>-		uint32_t del_token_size;
>-		memcpy(&del_token_size, del_tokens, sizeof(uint32_t));
>-		total_del_token_size += del_token_size;
>-		del_tokens += del_token_size;
>+	lck = TALLOC_ZERO_P(talloc_tos(), struct share_mode_lock);
>+	if (lck == NULL) {
>+		return 0;
> 	}
> 
>-	sharepath = (const char *)rec->value.dptr + sizeof(*data) +
>-		data->u.s.num_share_mode_entries*sizeof(*shares) +
>-		total_del_token_size;
>-	fname = (const char *)rec->value.dptr + sizeof(*data) +
>-		data->u.s.num_share_mode_entries*sizeof(*shares) +
>-		total_del_token_size +
>-		strlen(sharepath) + 1;
>+	if (!parse_share_modes(rec->value, lck)) {
>+		TALLOC_FREE(lck);
>+		DEBUG(1, ("parse_share_modes failed\n"));
>+		return 0;
>+	}
> 
>-	for (i=0;i<data->u.s.num_share_mode_entries;i++) {
>-		state->fn(&shares[i], sharepath, fname,
>-			  state->private_data);
>+	for (i=0; i<lck->num_share_modes; i++) {
>+		struct share_mode_entry *se = &lck->share_modes[i];
>+		state->fn(se,
>+			lck->servicepath,
>+			lck->base_name,
>+			state->private_data);
> 	}
>+	TALLOC_FREE(lck);
> 	return 0;
> }
> 
>-- 
>1.7.7.3
>

Flags:

vl: review+

Actions: View

Attachments on bug 9058: 7734 | 7741 | 7742 | 7743 | 7744 | 7801 | 7802 | 7803 | 7809 | 7812 | 7813 | 7814 | 7816 | 7817