sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

krb5_wrap: add enctype arg to smb_krb5_kt_seek_and_delete_old_entries()

Browse Source 
Unused in this commit, the next commit will use it to avoid deleting
keys with the same kvno but a different enctype.

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Ralph Boehme 2016-04-21 20:54:12 +02:00 committed by Andreas Schneider
parent 0c373f2854
commit b26ae7fbf6
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5_wrap/krb5_samba.c
View File

@ -1485,6 +1485,7 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
krb5_keytab keytab,
krb5_kvno kvno,
krb5_enctype enctype,
const char *princ_s,
krb5_principal princ,
bool flush,
@ -1694,6 +1695,7 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context,
ret = smb_krb5_kt_seek_and_delete_old_entries(context,
keytab,
kvno,
enctype,
princ_s,
princ,
false,

1
lib/krb5_wrap/krb5_samba.h
View File

@ -193,6 +193,7 @@ krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
krb5_keytab keytab,
krb5_kvno kvno,
krb5_enctype enctype,
const char *princ_s,
krb5_principal princ,
bool flush,

1
source3/libads/kerberos_keytab.c
View File

@ -280,6 +280,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
ret = smb_krb5_kt_seek_and_delete_old_entries(context,
keytab,
kvno,
KRB5_ENCTYPE_NULL,
NULL,
NULL,
true,