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

krb5_wrap: Rename smb_krb5_open_keytab()

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 11:03:51 +02:00 committed by Andrew Bartlett
parent 5e934aad48
commit aa1cca9f27
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/krb5_wrap/krb5_samba.c
View File

@ -1116,10 +1116,10 @@ out:
return ret;
}
krb5_error_code smb_krb5_open_keytab(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab)
krb5_error_code smb_krb5_kt_open(krb5_context context,
const char *keytab_name_req,
bool write_access,
krb5_keytab *keytab)
{
if (keytab_name_req != NULL) {
if (keytab_name_req[0] != '/') {
@ -1372,7 +1372,7 @@ out:
*
* @return A corresponding KRB5 error code.
*
* @see smb_krb5_open_keytab()
* @see smb_krb5_kt_open()
*/
krb5_error_code smb_krb5_kt_add_entry(krb5_context context,
krb5_keytab keytab,

8
lib/krb5_wrap/krb5_samba.h
View File

@ -206,10 +206,10 @@ 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,
krb5_keytab *keytab);
krb5_error_code smb_krb5_kt_open(krb5_context context,
const char *keytab_name,
bool write_access,
krb5_keytab *keytab);
krb5_error_code smb_krb5_keytab_name(TALLOC_CTX *mem_ctx,
krb5_context context,
krb5_keytab keytab,

16
source3/libads/kerberos_keytab.c
View File

@ -75,9 +75,9 @@ int ads_keytab_add_entry(ADS_STRUCT *ads, const char *srvPrinc)
return -1;
}
ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
ret = smb_krb5_kt_open(context, NULL, True, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
goto out;
}
@ -262,9 +262,9 @@ int ads_keytab_flush(ADS_STRUCT *ads)
return ret;
}
ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
ret = smb_krb5_kt_open(context, NULL, True, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
goto out;
}
@ -447,9 +447,9 @@ int ads_keytab_create_default(ADS_STRUCT *ads)
DEBUG(3, (__location__ ": Searching for keytab entries to preserve "
"and update.\n"));
ret = smb_krb5_open_keytab(context, NULL, True, &keytab);
ret = smb_krb5_kt_open(context, NULL, True, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
goto done;
}
@ -600,9 +600,9 @@ int ads_keytab_list(const char *keytab_name)
return ret;
}
ret = smb_krb5_open_keytab(context, keytab_name, False, &keytab);
ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
goto out;
}

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

@ -431,9 +431,9 @@ static krb5_error_code fill_mem_keytab_from_system_keytab(krb5_context krbctx,
ZERO_STRUCT(kt_entry);
ZERO_STRUCT(kt_cursor);
ret = smb_krb5_open_keytab(krbctx, NULL, false, &keytab);
ret = smb_krb5_kt_open(krbctx, NULL, false, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
goto out;
}
@ -528,10 +528,10 @@ static krb5_error_code fill_mem_keytab_from_dedicated_keytab(krb5_context krbctx
krb5_kt_cursor kt_cursor;
krb5_keytab_entry kt_entry;
ret = smb_krb5_open_keytab(krbctx, lp_dedicated_keytab_file(),
ret = smb_krb5_kt_open(krbctx, lp_dedicated_keytab_file(),
false, &keytab);
if (ret) {
DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n",
DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
error_message(ret)));
return ret;
}