sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-27 14:04:05 +03:00
Code

Revert "s3-kerberos: use krb5 compat macros in fill_keytab_from_password()."

Browse Source 
This reverts commit 9986d25ed195ee77bd73c96f057c527b4c3a8f03.

This patch was causing us to free unallocated memory.

Signed-off-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Simo Sorce 2010-09-02 16:07:00 -04:00 committed by Günther Deschner
parent ac317eba25
commit d9c63fbe92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/librpc/rpc/dcerpc_krb5.c
View File

@ -128,7 +128,10 @@ static krb5_error_code fill_keytab_from_password(krb5_context krbctx,
for (i = 0; enctypes[i]; i++) {
krb5_keyblock *key = NULL;
key = KRB5_KT_KEY(&kt_entry);
if (!(key = SMB_MALLOC_P(krb5_keyblock))) {
ret = ENOMEM;
goto out;
}
if (create_kerberos_key_from_string(krbctx, princ,
password, key,
@ -136,11 +139,13 @@ static krb5_error_code fill_keytab_from_password(krb5_context krbctx,
DEBUG(10, ("Failed to create key for enctype %d "
"(error: %s)\n",
enctypes[i], error_message(ret)));
SAFE_FREE(key);
continue;
}
kt_entry.principal = princ;
kt_entry.vno = vno;
kt_entry.key = *key;
ret = krb5_kt_add_entry(krbctx, keytab, &kt_entry);
if (ret) {