summaryrefslogtreecommitdiff
path: root/source3/lib/util.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2014-04-04 16:47:32 -0700
committerVolker Lendecke <vl@samba.org>2014-04-05 13:40:29 +0200
commit5963519ec33c436ae4616c556d8ab5c6028e6bf6 (patch)
tree2fd8401f8db43c3dd96bf5dd34431818004804d7 /source3/lib/util.c
parentc35b31f45244a8339684c3b83a7d86eefb80e0da (diff)
downloadsamba-5963519ec33c436ae4616c556d8ab5c6028e6bf6.tar.gz
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> Reviewed-by: Volker Lendecke <vl@samba.org> Autobuild-User(master): Volker Lendecke <vl@samba.org> Autobuild-Date(master): Sat Apr 5 13:40:30 CEST 2014 on sn-devel-104
Diffstat (limited to 'source3/lib/util.c')
-rw-r--r--source3/lib/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 07daad2894b..374bc5d5c92 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);
}
/**