oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

use krb5_get_error_message()

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-03 23:33:50 -08:00
parent 07a81e6c86
commit 79597c6a3a
1 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
kdc/kerberos5.c
View File

@@ -273,8 +273,9 @@ _kdc_encode_reply(krb5_context context,
ASN1_MALLOC_ENCODE(EncTicketPart, buf, buf_size, et, &len, ret); ASN1_MALLOC_ENCODE(EncTicketPart, buf, buf_size, et, &len, ret);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Failed to encode ticket: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "Failed to encode ticket: %s", msg);
krb5_free_error_message(context, msg);
return ret; return ret;
} }
if(buf_size != len) { if(buf_size != len) {
@@ -287,8 +288,9 @@ _kdc_encode_reply(krb5_context context,
ret = krb5_crypto_init(context, skey, etype, &crypto); ret = krb5_crypto_init(context, skey, etype, &crypto);
if (ret) { if (ret) {
free(buf); free(buf);
kdc_log(context, config, 0, "krb5_crypto_init failed: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "krb5_crypto_init failed: %s", msg);
krb5_free_error_message(context, msg);
return ret; return ret;
} }
@@ -302,8 +304,9 @@ _kdc_encode_reply(krb5_context context,
free(buf); free(buf);
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Failed to encrypt data: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "Failed to encrypt data: %s", msg);
krb5_free_error_message(context, msg);
return ret; return ret;
} }
@@ -312,8 +315,9 @@ _kdc_encode_reply(krb5_context context,
else else
ASN1_MALLOC_ENCODE(EncTGSRepPart, buf, buf_size, ek, &len, ret); ASN1_MALLOC_ENCODE(EncTGSRepPart, buf, buf_size, ek, &len, ret);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Failed to encode KDC-REP: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "Failed to encode KDC-REP: %s", msg);
krb5_free_error_message(context, msg);
return ret; return ret;
} }
if(buf_size != len) { if(buf_size != len) {
@@ -324,9 +328,10 @@ _kdc_encode_reply(krb5_context context,
} }
ret = krb5_crypto_init(context, reply_key, 0, &crypto); ret = krb5_crypto_init(context, reply_key, 0, &crypto);
if (ret) { if (ret) {
const char *msg = krb5_get_error_message(context, ret);
free(buf); free(buf);
kdc_log(context, config, 0, "krb5_crypto_init failed: %s", kdc_log(context, config, 0, "krb5_crypto_init failed: %s", msg);
krb5_get_err_text(context, ret)); krb5_free_error_message(context, msg);
return ret; return ret;
} }
if(rep->msg_type == krb_as_rep) { if(rep->msg_type == krb_as_rep) {
@@ -352,8 +357,9 @@ _kdc_encode_reply(krb5_context context,
} }
krb5_crypto_destroy(context, crypto); krb5_crypto_destroy(context, crypto);
if(ret) { if(ret) {
kdc_log(context, config, 0, "Failed to encode KDC-REP: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "Failed to encode KDC-REP: %s", msg);
krb5_free_error_message(context, msg);
return ret; return ret;
} }
if(buf_size != len) { if(buf_size != len) {
@@ -981,8 +987,9 @@ _kdc_as_rep(krb5_context context,
ret = _kdc_db_fetch(context, config, client_princ, ret = _kdc_db_fetch(context, config, client_princ,
HDB_F_GET_CLIENT | flags, &clientdb, &client); HDB_F_GET_CLIENT | flags, &clientdb, &client);
if(ret){ if(ret){
kdc_log(context, config, 0, "UNKNOWN -- %s: %s", client_name, const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "UNKNOWN -- %s: %s", client_name, msg);
krb5_free_error_message(context, msg);
ret = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN; ret = KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN;
goto out; goto out;
} }
@@ -991,8 +998,9 @@ _kdc_as_rep(krb5_context context,
HDB_F_GET_SERVER|HDB_F_GET_KRBTGT, HDB_F_GET_SERVER|HDB_F_GET_KRBTGT,
NULL, &server); NULL, &server);
if(ret){ if(ret){
kdc_log(context, config, 0, "UNKNOWN -- %s: %s", server_name, const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "UNKNOWN -- %s: %s", server_name, msg);
krb5_free_error_message(context, msg);
ret = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN; ret = KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN;
goto out; goto out;
} }
@@ -1136,8 +1144,9 @@ _kdc_as_rep(krb5_context context,
try_next_key: try_next_key:
ret = krb5_crypto_init(context, &pa_key->key, 0, &crypto); ret = krb5_crypto_init(context, &pa_key->key, 0, &crypto);
if (ret) { if (ret) {
kdc_log(context, config, 0, "krb5_crypto_init failed: %s", const char *msg = krb5_get_error_message(context, ret);
krb5_get_err_text(context, ret)); kdc_log(context, config, 0, "krb5_crypto_init failed: %s", msg);
krb5_free_error_message(context, msg);
free_EncryptedData(&enc_data); free_EncryptedData(&enc_data);
continue; continue;
} }
@@ -1155,6 +1164,8 @@ _kdc_as_rep(krb5_context context,
*/ */
if(ret){ if(ret){
krb5_error_code ret2; krb5_error_code ret2;
const char *msg = krb5_get_error_message(context, ret);
ret2 = krb5_enctype_to_string(context, ret2 = krb5_enctype_to_string(context,
pa_key->key.keytype, &str); pa_key->key.keytype, &str);
if (ret2) if (ret2)
@@ -1162,9 +1173,8 @@ _kdc_as_rep(krb5_context context,
kdc_log(context, config, 5, kdc_log(context, config, 5,
"Failed to decrypt PA-DATA -- %s " "Failed to decrypt PA-DATA -- %s "
"(enctype %s) error %s", "(enctype %s) error %s",
client_name, client_name, str ? str : "unknown enctype", msg);
str ? str : "unknown enctype", krb5_free_error_message(context, msg);
krb5_get_err_text(context, ret));
free(str); free(str);
if(hdb_next_enctype2key(context, &client->entry, if(hdb_next_enctype2key(context, &client->entry,