diff options
| author | Stefan Metzmacher <metze@samba.org> | 2022-10-26 10:34:47 +0200 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2022-10-27 21:14:43 +0000 |
| commit | b7ea69bdff3b58e3a0a15de26cd317d0e959df00 (patch) | |
| tree | 62f241813d95fe0f1e67033f531936629b9fed3b | |
| parent | 39cf93c79ef17eac4196e1de6e825955f7fbc8d8 (diff) | |
| download | samba-b7ea69bdff3b58e3a0a15de26cd317d0e959df00.tar.gz | |
lib/krb5_wrap: remove unused keep_old_entries argument from smb_krb5_kt_add_entry()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.c | 9 | ||||
| -rw-r--r-- | lib/krb5_wrap/krb5_samba.h | 3 | ||||
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 6 | ||||
| -rw-r--r-- | source4/libnet/libnet_export_keytab.c | 3 |
4 files changed, 7 insertions, 14 deletions
diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c index 4afec815b0d..31938435e26 100644 --- a/lib/krb5_wrap/krb5_samba.c +++ b/lib/krb5_wrap/krb5_samba.c @@ -1829,8 +1829,6 @@ out: * this is only set to false for encryption types * which do not support salting like RC4. * - * @param[in] keep_old_entries Whether to keep or delete old keytab entries. - * * @retval 0 on Success * * @return A corresponding KRB5 error code. @@ -1844,8 +1842,7 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context, const char *salt_principal, krb5_enctype enctype, krb5_data *password, - bool no_salt, - bool keep_old_entries) + bool no_salt) { krb5_error_code ret; krb5_keytab_entry kt_entry; @@ -1868,8 +1865,8 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context, enctype, princ_s, princ, - false, - keep_old_entries); + false, /* flush */ + false); /* keep_old_entries */ if (ret) { goto out; } diff --git a/lib/krb5_wrap/krb5_samba.h b/lib/krb5_wrap/krb5_samba.h index d082ed43f03..d11f715d929 100644 --- a/lib/krb5_wrap/krb5_samba.h +++ b/lib/krb5_wrap/krb5_samba.h @@ -226,8 +226,7 @@ krb5_error_code smb_krb5_kt_add_entry(krb5_context context, const char *salt_principal, krb5_enctype enctype, krb5_data *password, - bool no_salt, - bool keep_old_entries); + bool no_salt); krb5_error_code smb_krb5_get_credentials(krb5_context context, krb5_ccache ccache, diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index b7e1846bd9f..00830a23f40 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -306,8 +306,7 @@ static int add_kt_entry_etypes(krb5_context context, TALLOC_CTX *tmpctx, salt_princ_s, enctypes[i], password, - false, - false); + false); /* no_salt */ if (ret) { DBG_WARNING("Failed to add entry to keytab\n"); goto out; @@ -322,8 +321,7 @@ static int add_kt_entry_etypes(krb5_context context, TALLOC_CTX *tmpctx, salt_princ_s, enctypes[i], password, - false, - false); + false); /* no_salt */ if (ret) { DBG_WARNING("Failed to add short entry to keytab\n"); goto out; diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c index 4c9654661cb..8f548e14eeb 100644 --- a/source4/libnet/libnet_export_keytab.c +++ b/source4/libnet/libnet_export_keytab.c @@ -113,8 +113,7 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx, NULL, enctype, &password, - true, /* no_salt */ - false); /* keeyp_old_entries */ + true); /* no_salt */ if (code != 0) { status = NT_STATUS_UNSUCCESSFUL; *error_string = smb_get_krb5_error_message(context, |