Attachment 9831 Details for Bug 10538 – git-am fix for master.

[patch] git-am fix for master.

0001-s3-smbd-nmbd-winbindd-fix-append-on-trailing-slash-o.patch (text/plain), 1.15 KB, created by Jeremy Allison on 2014-04-04 23:49:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeremy Allison

Created: 2014-04-04 23:49:15 UTC

Size: 1.15 KB

patch

obsolete

>From 3bd60c6d9d357a5182981305926a93bf357863d9 Mon Sep 17 00:00:00 2001
>From: Jeremy Allison <jra@samba.org>
>Date: Fri, 4 Apr 2014 16:47:32 -0700
>Subject: [PATCH] s3: smbd/nmbd/winbindd - fix append on trailing slash on
> system paths.
>
>The xx_path() function incorrectly uses talloc_asprintf_append()
>instead of talloc_asprintf() on a path that may have been modified
>by the trim_string() call previously. talloc_asprintf_append()
>always sticks the new text at the *end* of the allocated buffer,
>not at the end of the string.
>
>Fix bug #10538 - Daemons crashing when lock/state/cache directory parameter has a trailing slash
>
>https://bugzilla.samba.org/show_bug.cgi?id=10538
>
>Signed-off-by: Jeremy Allison <jra@samba.org>
>---
> source3/lib/util.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/source3/lib/util.c b/source3/lib/util.c
>index 07daad2..374bc5d 100644
>--- a/source3/lib/util.c
>+++ b/source3/lib/util.c
>@@ -1504,7 +1504,7 @@ static char *xx_path(const char *name, const char *rootpath)
> 		}
> 	}
> 
>-	return talloc_asprintf_append_buffer(fname, "/%s", name);
>+	return talloc_asprintf_append(fname, "/%s", name);
> }
> 
> /**
>-- 
>1.9.1.423.g4596e3a
>

Actions: View

Attachments on bug 10538: 9829 | 9831