sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

krb5_wrap: Rename smb_krb5_open_keytab_relative()

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 10:42:57 +02:00 committed by Andrew Bartlett
parent 8abd9b5f07
commit 81da37eb90
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/krb5_wrap/krb5_samba.c
View File

@ -988,10 +988,10 @@ krb5_error_code smb_krb5_enctype_to_string(krb5_context context,
#define MAX_KEYTAB_NAME_LEN 1100
#endif
krb5_error_code smb_krb5_open_keytab_relative(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab)
krb5_error_code smb_krb5_kt_open_relative(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab)
{
krb5_error_code ret = 0;
TALLOC_CTX *mem_ctx;
@ -1119,10 +1119,10 @@ krb5_error_code smb_krb5_open_keytab(krb5_context context,
}
}
return smb_krb5_open_keytab_relative(context,
keytab_name_req,
write_access,
keytab);
return smb_krb5_kt_open_relative(context,
keytab_name_req,
write_access,
keytab);
}
krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,

8
lib/krb5_wrap/krb5_samba.h
View File

@ -202,10 +202,10 @@ 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);
krb5_error_code smb_krb5_open_keytab_relative(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab);
krb5_error_code smb_krb5_kt_open_relative(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab);
krb5_error_code smb_krb5_open_keytab(krb5_context context,
const char *keytab_name,
bool write_access,

8
source3/libnet/libnet_keytab.c
View File

@ -81,10 +81,10 @@ krb5_error_code libnet_keytab_init(TALLOC_CTX *mem_ctx,
return ret;
}
ret = smb_krb5_open_keytab_relative(context,
keytab_name,
true, /* write_access */
&keytab);
ret = smb_krb5_kt_open_relative(context,
keytab_name,
true, /* write_access */
&keytab);
if (ret) {
DEBUG(1,("keytab_init: smb_krb5_open_keytab failed (%s)\n",
error_message(ret)));

2
source4/kdc/ktutil.c
View File

@ -66,7 +66,7 @@ int main (int argc, char **argv)
smb_krb5_err(mem_ctx, context, 1, ret, "krb5_context");
}
ret = smb_krb5_open_keytab_relative(context, keytab_name, false, &keytab);
ret = smb_krb5_kt_open_relative(context, keytab_name, false, &keytab);
if (ret) {
smb_krb5_err(mem_ctx, context, 1, ret, "open keytab");
}

8
source4/libnet/libnet_export_keytab.c
View File

@ -44,10 +44,10 @@ static NTSTATUS sdb_kt_copy(TALLOC_CTX *mem_ctx,
bool copy_one_principal = (principal != NULL);
krb5_data password;
code = smb_krb5_open_keytab_relative(context,
keytab_name,
true, /* write_access */
&keytab);
code = smb_krb5_kt_open_relative(context,
keytab_name,
true, /* write_access */
&keytab);
if (code != 0) {
*error_string = talloc_asprintf(mem_ctx,
"Failed to open keytab: %s",