[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  ca84795... Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV)
      from  ed457e0... Fix two uses of strncat -> strlcat. Ensure proper use of strncpy when setting socket name.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit ca847952054f5bbde1d40ad4260589b6fcc9721d
Author: SASAJIMA Toshihiro <sasajima_t at jp.fujitsu.com>
Date:   Tue Jan 12 21:43:23 2010 -0800

    Fix bug #7034 - vfs_cap causes signal 11 (SIGSEGV)

-----------------------------------------------------------------------

Summary of changes:
 source3/modules/vfs_cap.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 7edbb87..35fa740 100644
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -695,12 +695,13 @@ static char *capdecode(TALLOC_CTX *ctx, const char *from)
 	size_t len = 0;
 
 	for (p1 = from; *p1; len++) {
-		if (is_hex(from)) {
+		if (is_hex(p1)) {
 			p1 += 3;
 		} else {
 			p1++;
 		}
 	}
+	len++;
 
 	to = TALLOC_ARRAY(ctx, char, len);
 	if (!to) {


-- 
Samba Shared Repository