The branch, v3-6-test has been updated via 38155e2 A couple more off-by-one calculations with strlcpy. from 65d7144 s3-waf: add vfs_gpfs_hsm_notify to the build.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit 38155e2833fc3a19b2fd6e4e35d4fd5711b5785f Author: Jeremy Allison <j...@samba.org> Date: Fri May 6 07:54:18 2011 -0700 A couple more off-by-one calculations with strlcpy. Autobuild-User: Jeremy Allison <j...@samba.org> Autobuild-Date: Fri May 6 18:39:17 CEST 2011 on sn-devel-104 (cherry picked from commit f7b3909103a0acd5ee0426b85112f2c9ed4e7730) ----------------------------------------------------------------------- Summary of changes: source3/groupdb/mapping_tdb.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/groupdb/mapping_tdb.c b/source3/groupdb/mapping_tdb.c index 1137b8f..548d3a3 100644 --- a/source3/groupdb/mapping_tdb.c +++ b/source3/groupdb/mapping_tdb.c @@ -900,10 +900,10 @@ static int convert_ldb_record(TDB_CONTEXT *ltdb, TDB_DATA key, } } else if (StrCaseCmp(name, "ntname") == 0) { strlcpy(map.nt_name, val, - sizeof(map.nt_name) -1); + sizeof(map.nt_name)); } else if (StrCaseCmp(name, "comment") == 0) { strlcpy(map.comment, val, - sizeof(map.comment) -1); + sizeof(map.comment)); } else if (StrCaseCmp(name, "member") == 0) { if (!string_to_sid(&members[j], val)) { errno = EIO; -- Samba Shared Repository