diff options
| author | Volker Lendecke <vl@samba.org> | 2011-04-13 08:35:00 +0200 |
|---|---|---|
| committer | Volker Lendecke <vlendec@samba.org> | 2011-04-13 09:30:55 +0200 |
| commit | 111f4ec8b742898310a0e1df6aceeb3dbfdc822c (patch) | |
| tree | ff386c640baf39ede2776ac6dc129bb645ebaf2b /libcli | |
| parent | 53e0bada43a9185f502a38e960337b51aab7bcf8 (diff) | |
| download | samba-111f4ec8b742898310a0e1df6aceeb3dbfdc822c.tar.gz samba-111f4ec8b742898310a0e1df6aceeb3dbfdc822c.tar.bz2 samba-111f4ec8b742898310a0e1df6aceeb3dbfdc822c.zip | |
s3: Use talloc_tos() in the S3 build
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Wed Apr 13 09:30:55 CEST 2011 on sn-devel-104
Diffstat (limited to 'libcli')
| -rw-r--r-- | libcli/auth/smbencrypt.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libcli/auth/smbencrypt.c b/libcli/auth/smbencrypt.c index cbb2eb5c9c..d090345bb8 100644 --- a/libcli/auth/smbencrypt.c +++ b/libcli/auth/smbencrypt.c @@ -118,6 +118,7 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) { bool ret; uint8_t dospwd[14]; + TALLOC_CTX *mem_ctx; size_t converted_size; @@ -125,7 +126,12 @@ bool E_deshash(const char *passwd, uint8_t p16[16]) ZERO_STRUCT(dospwd); - tmpbuf = strupper_talloc(NULL, passwd); +#if _SAMBA_BUILD_ == 3 + mem_ctx = talloc_tos(); +#else + mem_ctx = NULL; +#endif + tmpbuf = strupper_talloc(mem_ctx, passwd); if (tmpbuf == NULL) { /* Too many callers don't check this result, we need to fill in the buffer with something */ safe_strcpy((char *)dospwd, passwd, sizeof(dospwd)-1); |