[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Sat Apr 5 05:41:04 MDT 2014
The branch, master has been updated
via 5963519 s3: smbd/nmbd/winbindd - fix append on trailing slash on system paths.
from c35b31f s3: enforce a positive allocation_file_size for non-empty files
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 5963519ec33c436ae4616c556d8ab5c6028e6bf6
Author: Jeremy Allison <jra at samba.org>
Date: Fri Apr 4 16:47:32 2014 -0700
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 at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Autobuild-User(master): Volker Lendecke <vl at samba.org>
Autobuild-Date(master): Sat Apr 5 13:40:30 CEST 2014 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/lib/util.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
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);
}
/**
--
Samba Shared Repository
More information about the samba-cvs
mailing list