sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

lib/krb5_wrap: remove unused keep_old_entries argument from smb_krb5_kt_seek_and_delete_old_entries()

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2022-10-26 10:34:47 +02:00 committed by Jeremy Allison
parent b7ea69bdff
commit 7958e18b8a
3 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/krb5_wrap/krb5_samba.c
View File

@ -1638,8 +1638,6 @@ krb5_error_code smb_krb5_kt_get_name(TALLOC_CTX *mem_ctx,
* *
* @param[in] flush Whether to flush the complete keytab. * @param[in] flush Whether to flush the complete keytab.
* *
* @param[in] keep_old_entries Keep the entry with the previous kvno.
*
* @retval 0 on Sucess * @retval 0 on Sucess
* *
* @return An appropriate KRB5 error code. * @return An appropriate KRB5 error code.
@ -1650,8 +1648,7 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
krb5_enctype enctype, krb5_enctype enctype,
const char *princ_s, const char *princ_s,
krb5_principal princ, krb5_principal princ,
bool flush, bool flush)
bool keep_old_entries)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_kt_cursor cursor; krb5_kt_cursor cursor;
@ -1741,13 +1738,6 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
continue; continue;
} }
if (keep_old_entries) {
DEBUG(5, (__location__ ": Saving old (kvno %d) "
"entry for principal: %s.\n",
kvno, princ_s));
continue;
}
if (!flush && if (!flush &&
((kt_entry.vno & 0xff) == (kvno & 0xff)) && ((kt_entry.vno & 0xff) == (kvno & 0xff)) &&
(kt_entry_enctype != enctype)) (kt_entry_enctype != enctype))
@ -1865,8 +1855,7 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context,
enctype, enctype,
princ_s, princ_s,
princ, princ,
false, /* flush */ false); /* flush */
false); /* keep_old_entries */
if (ret) { if (ret) {
goto out; goto out;
} }

3
lib/krb5_wrap/krb5_samba.h
View File

@ -217,8 +217,7 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
krb5_enctype enctype, krb5_enctype enctype,
const char *princ_s, const char *princ_s,
krb5_principal princ, krb5_principal princ,
bool flush, bool flush);
bool keep_old_entries);
krb5_error_code smb_krb5_kt_add_entry(krb5_context context, krb5_error_code smb_krb5_kt_add_entry(krb5_context context,
krb5_keytab keytab, krb5_keytab keytab,
krb5_kvno kvno, krb5_kvno kvno,

3
source3/libads/kerberos_keytab.c
View File

@ -496,8 +496,7 @@ int ads_keytab_flush(ADS_STRUCT *ads)
ENCTYPE_NULL, ENCTYPE_NULL,
NULL, NULL,
NULL, NULL,
true, true); /* flush */
false);
if (ret) { if (ret) {
goto out; goto out;
} }