diff options
| author | Michael Adam <obnox@samba.org> | 2011-05-11 11:57:10 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-05-12 12:52:02 +0200 |
| commit | cd1d75c7a4f84e16c6da2d56ddcd42e285453d21 (patch) | |
| tree | a4a41ea5412e1602aee9554821603dcb8cbe563d | |
| parent | 26b683116459dad57888dcab6f6f05400e855894 (diff) | |
| download | samba-cd1d75c7a4f84e16c6da2d56ddcd42e285453d21.tar.gz samba-cd1d75c7a4f84e16c6da2d56ddcd42e285453d21.tar.bz2 samba-cd1d75c7a4f84e16c6da2d56ddcd42e285453d21.zip | |
libcli/auth/smbencrypt: in E_deshash, use talloc_stackframe instead of "#if _SAMBA_BUILD_ == 3" and talloc_tos()
talloc_stackframe() is used in other shared components already,
and if the stack is a talloc_pool, then in most cases, it should
also not be more expensive than directly using talloc_tos().
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu May 12 12:52:02 CEST 2011 on sn-devel-104
| -rw-r--r-- | libcli/auth/smbencrypt.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c index 0cd836302b..66fdbd25a8 100644 --- a/libcli/auth/smbencrypt.c +++ b/libcli/auth/smbencrypt.c @@ -118,7 +118,7 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) { bool ret; uint8_t dospwd[14]; - TALLOC_CTX *mem_ctx; + TALLOC_CTX *frame = talloc_stackframe(); size_t converted_size; @@ -126,23 +126,19 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) ZERO_STRUCT(dospwd); -#if _SAMBA_BUILD_ == 3 - mem_ctx = talloc_tos(); -#else - mem_ctx = NULL; -#endif - tmpbuf = strupper_talloc(mem_ctx, passwd); + tmpbuf = strupper_talloc(frame, passwd); if (tmpbuf == NULL) { /* Too many callers don't check this result, we need to fill in the buffer with something */ strlcpy((char *)dospwd, passwd ? passwd : "", sizeof(dospwd)); E_P16(dospwd, p16); + talloc_free(frame); return false; } ZERO_STRUCT(dospwd); ret = convert_string_error(CH_UNIX, CH_DOS, tmpbuf, strlen(tmpbuf), dospwd, sizeof(dospwd), &converted_size); - talloc_free(tmpbuf); + talloc_free(frame); /* Only the first 14 chars are considered, password need not * be null terminated. We do this in the error and success |