The branch, master has been updated via 8ae354e s3: Remove some unused code via c562a53 s3: Fix a likely cut&paste error from 5e6357b lib/ccan: add a missing dependency to 'execinfo' for 'backtrace()'
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8ae354ed4e3443dce7678a4c0ad3bd034bf5305b Author: Volker Lendecke <v...@samba.org> Date: Tue May 15 13:37:25 2012 +0200 s3: Remove some unused code Autobuild-User: Volker Lendecke <v...@samba.org> Autobuild-Date: Tue May 15 18:24:10 CEST 2012 on sn-devel-104 commit c562a534c854388e860d0231aab5dad4f06dfe2c Author: Volker Lendecke <v...@samba.org> Date: Mon May 14 19:48:16 2012 +0200 s3: Fix a likely cut&paste error ----------------------------------------------------------------------- Summary of changes: source3/lib/util_malloc.c | 14 -------------- source3/smbd/lanman.c | 2 +- 2 files changed, 1 insertions(+), 15 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/util_malloc.c b/source3/lib/util_malloc.c index faff9b0..ff78db6 100644 --- a/source3/lib/util_malloc.c +++ b/source3/lib/util_malloc.c @@ -40,20 +40,6 @@ void *malloc_(size_t size) } /**************************************************************************** - Internal calloc wrapper. Not externally visible. -****************************************************************************/ - -static void *calloc_(size_t count, size_t size) -{ - if (size == 0 || count == 0) { - return NULL; - } -#undef calloc - return calloc(count, size); -#define calloc(n,s) __ERROR_DONT_USE_CALLOC_DIRECTLY -} - -/**************************************************************************** Internal realloc wrapper. Not externally visible. ****************************************************************************/ diff --git a/source3/smbd/lanman.c b/source3/smbd/lanman.c index 31775bf..ac2faa9 100644 --- a/source3/smbd/lanman.c +++ b/source3/smbd/lanman.c @@ -3145,7 +3145,7 @@ static bool api_SetUserPassword(struct smbd_server_connection *sconn, ZERO_STRUCT(old_lm_hash); ZERO_STRUCT(new_lm_hash); memcpy(old_lm_hash.hash, pass1, MIN(strlen(pass1), 16)); - memcpy(new_lm_hash.hash, pass1, MIN(strlen(pass2), 16)); + memcpy(new_lm_hash.hash, pass2, MIN(strlen(pass2), 16)); } status = dcerpc_samr_ChangePasswordUser(b, mem_ctx, -- Samba Shared Repository