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

krb5_wrap: Rename smb_get_enctype_from_kt_entry()

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andreas Schneider 2016-08-29 09:17:37 +02:00 committed by Andrew Bartlett
parent bff77afd32
commit d1de425385
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/krb5_wrap/krb5_samba.c
View File

@ -896,7 +896,7 @@ krb5_error_code smb_krb5_gen_netbios_krb5_address(smb_krb5_addresses **kerb_addr
return ret;
}
krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry)
krb5_enctype smb_krb5_kt_get_enctype_from_entry(krb5_keytab_entry *kt_entry)
{
return KRB5_KEY_TYPE(KRB5_KT_KEY(kt_entry));
}
@ -1176,7 +1176,7 @@ krb5_error_code smb_krb5_kt_seek_and_delete_old_entries(krb5_context context,
while (!krb5_kt_next_entry(context, keytab, &kt_entry, &cursor)) {
bool name_ok = false;
krb5_enctype kt_entry_enctype =
smb_get_enctype_from_kt_entry(&kt_entry);
smb_krb5_kt_get_enctype_from_entry(&kt_entry);
if (!flush && (princ_s != NULL)) {
ret = smb_krb5_unparse_name(tmp_ctx, context,

3
lib/krb5_wrap/krb5_samba.h
View File

@ -197,7 +197,8 @@ krb5_error_code smb_krb5_free_addresses(krb5_context context, smb_krb5_addresses
NTSTATUS krb5_to_nt_status(krb5_error_code kerberos_error);
krb5_error_code nt_status_to_krb5(NTSTATUS nt_status);
krb5_enctype smb_get_enctype_from_kt_entry(krb5_keytab_entry *kt_entry);
krb5_enctype smb_krb5_kt_get_enctype_from_entry(krb5_keytab_entry *kt_entry);
krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
krb5_enctype enctype,
char **etype_s);

2
source3/libads/kerberos_keytab.c
View File

@ -627,7 +627,7 @@ int ads_keytab_list(const char *keytab_name)
goto out;
}
enctype = smb_get_enctype_from_kt_entry(&kt_entry);
enctype = smb_krb5_kt_get_enctype_from_entry(&kt_entry);
ret = smb_krb5_enctype_to_string(context, enctype, &etype_s);
if (ret &&

3
source3/librpc/crypto/gse_krb5.c
View File

@ -242,7 +242,8 @@ static krb5_error_code fill_mem_keytab_from_secrets(krb5_context krbctx,
* we can verify if the keytab needs to be upgraded */
while ((ret = krb5_kt_next_entry(krbctx, *keytab,
&kt_entry, &kt_cursor)) == 0) {
if (smb_get_enctype_from_kt_entry(&kt_entry) == CLEARTEXT_PRIV_ENCTYPE) {
if (smb_krb5_kt_get_enctype_from_entry(&kt_entry) ==
CLEARTEXT_PRIV_ENCTYPE) {
break;
}
smb_krb5_kt_free_entry(krbctx, &kt_entry);

2
source4/kdc/ktutil.c
View File

@ -82,7 +82,7 @@ int main (int argc, char **argv)
{
char *principal = NULL;
char *enctype_str = NULL;
krb5_enctype enctype = smb_get_enctype_from_kt_entry(&entry);
krb5_enctype enctype = smb_krb5_kt_get_enctype_from_entry(&entry);
ret = smb_krb5_unparse_name(mem_ctx,
context,