The branch, v3-6-test has been updated via d18caa5... s3: Fix an uninitialized variable via bee5670... s3: Fix a C++ warning from 3f4c99b... s3-torture: Improve the winreg deletekey torture comments. (cherry picked from commit 91a8d9bc9bfe557c1095a7262e3a1b28fc3279ab)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log ----------------------------------------------------------------- commit d18caa5d65ff3d5e5b366376910599e9b3c11e6a Author: Volker Lendecke <v...@samba.org> Date: Sun Aug 1 20:15:57 2010 +0200 s3: Fix an uninitialized variable commit bee567072dd03aa83fd67df9b1b5a700527cd24d Author: Volker Lendecke <v...@samba.org> Date: Sun Aug 1 20:15:39 2010 +0200 s3: Fix a C++ warning ----------------------------------------------------------------------- Summary of changes: source3/lib/system.c | 2 +- source3/modules/vfs_acl_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/system.c b/source3/lib/system.c index 2877ba9..ee8efe8 100644 --- a/source3/lib/system.c +++ b/source3/lib/system.c @@ -1790,7 +1790,7 @@ static ssize_t bsd_attr_list (int type, extattr_arg arg, char *list, size_t size return -1; } /* Shift results back, so we can prepend prefixes */ - buf = memmove(list + len, list, list_size); + buf = (char *)memmove(list + len, list, list_size); for(i = 0; i < list_size; i += len + 1) { len = buf[i]; diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 79eb533..46ff2e6 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -251,7 +251,7 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct *handle, { DATA_BLOB blob; NTSTATUS status; - uint16_t hash_type; + uint16_t hash_type = XATTR_SD_HASH_TYPE_NONE; uint8_t hash[XATTR_SD_HASH_SIZE]; uint8_t hash_tmp[XATTR_SD_HASH_SIZE]; struct security_descriptor *psd = NULL; -- Samba Shared Repository