diff options
| author | Stefan Metzmacher <metze@samba.org> | 2013-08-09 10:15:05 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-08-12 16:48:43 +1200 |
| commit | b055b3118d9c2159e9d5a42830328cfc103f9555 (patch) | |
| tree | 92fa9c1bf0b334da0328ef20e8f910fe4444c705 | |
| parent | 20b64eae75b8809d67b8c2824616996bb4722612 (diff) | |
| download | samba-b055b3118d9c2159e9d5a42830328cfc103f9555.tar.gz samba-b055b3118d9c2159e9d5a42830328cfc103f9555.tar.bz2 samba-b055b3118d9c2159e9d5a42830328cfc103f9555.zip | |
auth/credentials: make sure cli_credentials_get_nt_hash() always returns a talloc object
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | auth/credentials/credentials.c | 19 | ||||
| -rw-r--r-- | auth/credentials/credentials.h | 4 |
2 files changed, 16 insertions, 7 deletions
diff --git a/auth/credentials/credentials.c b/auth/credentials/credentials.c index be497bc974..57a7c0b80d 100644 --- a/auth/credentials/credentials.c +++ b/auth/credentials/credentials.c @@ -471,8 +471,8 @@ _PUBLIC_ bool cli_credentials_set_old_password(struct cli_credentials *cred, * @param cred credentials context * @retval If set, the cleartext password, otherwise NULL */ -_PUBLIC_ const struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred, - TALLOC_CTX *mem_ctx) +_PUBLIC_ struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred, + TALLOC_CTX *mem_ctx) { const char *password = cli_credentials_get_password(cred); @@ -481,13 +481,22 @@ _PUBLIC_ const struct samr_Password *cli_credentials_get_nt_hash(struct cli_cred if (!nt_hash) { return NULL; } - + E_md4hash(password, nt_hash->hash); return nt_hash; - } else { - return cred->nt_hash; + } else if (cred->nt_hash != NULL) { + struct samr_Password *nt_hash = talloc(mem_ctx, struct samr_Password); + if (!nt_hash) { + return NULL; + } + + *nt_hash = *cred->nt_hash; + + return nt_hash; } + + return NULL; } /** diff --git a/auth/credentials/credentials.h b/auth/credentials/credentials.h index cb09dc326c..766a513cca 100644 --- a/auth/credentials/credentials.h +++ b/auth/credentials/credentials.h @@ -141,8 +141,8 @@ bool cli_credentials_set_password(struct cli_credentials *cred, enum credentials_obtained obtained); struct cli_credentials *cli_credentials_init_anon(TALLOC_CTX *mem_ctx); void cli_credentials_parse_string(struct cli_credentials *credentials, const char *data, enum credentials_obtained obtained); -const struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred, - TALLOC_CTX *mem_ctx); +struct samr_Password *cli_credentials_get_nt_hash(struct cli_credentials *cred, + TALLOC_CTX *mem_ctx); bool cli_credentials_set_realm(struct cli_credentials *cred, const char *val, enum credentials_obtained obtained); |