mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
r21863: Fix debug messages with incorrect function name.
Jeremy.
This commit is contained in:
parent
5b47c4e5c2
commit
d432d81c83
@ -55,20 +55,20 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
|
||||
ret = smb_krb5_parse_name(context, princ_s, &princ);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: smb_krb5_parse_name(%s) failed (%s)\n", princ_s, error_message(ret)));
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: smb_krb5_parse_name(%s) failed (%s)\n", princ_s, error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
|
||||
/* Seek and delete old keytab entries */
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
if (ret != KRB5_KT_END && ret != ENOENT ) {
|
||||
DEBUG(3,("ads_keytab_add_entry: Will try to delete old keytab entries\n"));
|
||||
DEBUG(3,("smb_krb5_kt_add_entry: Will try to delete old keytab entries\n"));
|
||||
while(!krb5_kt_next_entry(context, keytab, &kt_entry, &cursor)) {
|
||||
BOOL compare_name_ok = False;
|
||||
|
||||
ret = smb_krb5_unparse_name(context, kt_entry.principal, &ktprinc);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: smb_krb5_unparse_name failed (%s)\n",
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: smb_krb5_unparse_name failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
@ -89,7 +89,7 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
#endif
|
||||
|
||||
if (!compare_name_ok) {
|
||||
DEBUG(10,("ads_keytab_add_entry: ignoring keytab entry principal %s, kvno = %d\n",
|
||||
DEBUG(10,("smb_krb5_kt_add_entry: ignoring keytab entry principal %s, kvno = %d\n",
|
||||
ktprinc, kt_entry.vno));
|
||||
}
|
||||
|
||||
@ -97,39 +97,39 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
|
||||
if (compare_name_ok) {
|
||||
if (kt_entry.vno == kvno - 1) {
|
||||
DEBUG(5,("ads_keytab_add_entry: Saving previous (kvno %d) entry for principal: %s.\n",
|
||||
DEBUG(5,("smb_krb5_kt_add_entry: Saving previous (kvno %d) entry for principal: %s.\n",
|
||||
kvno - 1, princ_s));
|
||||
} else {
|
||||
|
||||
DEBUG(5,("ads_keytab_add_entry: Found old entry for principal: %s (kvno %d) - trying to remove it.\n",
|
||||
DEBUG(5,("smb_krb5_kt_add_entry: Found old entry for principal: %s (kvno %d) - trying to remove it.\n",
|
||||
princ_s, kt_entry.vno));
|
||||
ret = krb5_kt_end_seq_get(context, keytab, &cursor);
|
||||
ZERO_STRUCT(cursor);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: krb5_kt_end_seq_get() failed (%s)\n",
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: krb5_kt_end_seq_get() failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
ret = krb5_kt_remove_entry(context, keytab, &kt_entry);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: krb5_kt_remove_entry failed (%s)\n",
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: krb5_kt_remove_entry failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
|
||||
DEBUG(5,("ads_keytab_add_entry: removed old entry for principal: %s (kvno %d).\n",
|
||||
DEBUG(5,("smb_krb5_kt_add_entry: removed old entry for principal: %s (kvno %d).\n",
|
||||
princ_s, kt_entry.vno));
|
||||
|
||||
ret = krb5_kt_start_seq_get(context, keytab, &cursor);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: krb5_kt_start_seq failed (%s)\n",
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: krb5_kt_start_seq failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
ret = smb_krb5_kt_free_entry(context, &kt_entry);
|
||||
ZERO_STRUCT(kt_entry);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: krb5_kt_remove_entry failed (%s)\n",
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: krb5_kt_remove_entry failed (%s)\n",
|
||||
error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
@ -141,7 +141,7 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
ret = smb_krb5_kt_free_entry(context, &kt_entry);
|
||||
ZERO_STRUCT(kt_entry);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: smb_krb5_kt_free_entry failed (%s)\n", error_message(ret)));
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: smb_krb5_kt_free_entry failed (%s)\n", error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
@ -149,7 +149,7 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
ret = krb5_kt_end_seq_get(context, keytab, &cursor);
|
||||
ZERO_STRUCT(cursor);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: krb5_kt_end_seq_get failed (%s)\n",error_message(ret)));
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: krb5_kt_end_seq_get failed (%s)\n",error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
@ -180,13 +180,13 @@ static int smb_krb5_kt_add_entry( krb5_context context, krb5_keytab keytab,
|
||||
kt_entry.principal = princ;
|
||||
kt_entry.vno = kvno;
|
||||
|
||||
DEBUG(3,("ads_keytab_add_entry: adding keytab entry for (%s) with encryption type (%d) and version (%d)\n",
|
||||
DEBUG(3,("smb_krb5_kt_add_entry: adding keytab entry for (%s) with encryption type (%d) and version (%d)\n",
|
||||
princ_s, enctypes[i], kt_entry.vno));
|
||||
ret = krb5_kt_add_entry(context, keytab, &kt_entry);
|
||||
krb5_free_keyblock_contents(context, keyp);
|
||||
ZERO_STRUCT(kt_entry);
|
||||
if (ret) {
|
||||
DEBUG(1,("ads_keytab_add_entry: adding entry to keytab failed (%s)\n", error_message(ret)));
|
||||
DEBUG(1,("smb_krb5_kt_add_entry: adding entry to keytab failed (%s)\n", error_message(ret)));
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user