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

use krb5_warn where appropriate

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10969 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-05-07 08:53:36 +00:00
parent ad7edba33c
commit a51951c17a
1 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
appl/kx/krb5.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1995 - 2000, 2002 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -84,8 +84,7 @@ krb5_authenticate (kx_context *kc, int s)
ret = krb5_sname_to_principal (context, ret = krb5_sname_to_principal (context,
host, "host", KRB5_NT_SRV_HST, &server); host, "host", KRB5_NT_SRV_HST, &server);
if (ret) { if (ret) {
warnx ("krb5_sname_to_principal: %s: %s", host, krb5_warn (context, ret, "krb5_sname_to_principal: %s", host)
krb5_get_err_text(context, ret));
return 1; return 1;
} }
@@ -103,22 +102,21 @@ krb5_authenticate (kx_context *kc, int s)
NULL, NULL,
NULL); NULL);
if (ret) { if (ret) {
warnx ("krb5_sendauth: %s: %s", host, if(ret != KRB5_SENDAUTH_BADRESPONSE)
krb5_get_err_text(context, ret)); krb5_warn (context, ret, "krb5_sendauth: %s", host);
return 1; return 1;
} }
ret = krb5_auth_con_getkey (context, auth_context, &c->keyblock); ret = krb5_auth_con_getkey (context, auth_context, &c->keyblock);
if (ret) { if (ret) {
warnx ("krb5_auth_con_getkey: %s: %s", host, krb5_warn (context, ret, "krb5_auth_con_getkey: %s", host);
krb5_get_err_text(context, ret));
krb5_auth_con_free (context, auth_context); krb5_auth_con_free (context, auth_context);
return 1; return 1;
} }
ret = krb5_crypto_init (context, c->keyblock, 0, &c->crypto); ret = krb5_crypto_init (context, c->keyblock, 0, &c->crypto);
if (ret) { if (ret) {
warnx ("krb5_crypto_init: %s", krb5_get_err_text (context, ret)); krb5_warn (context, ret, "krb5_crypto_init");
krb5_auth_con_free (context, auth_context); krb5_auth_con_free (context, auth_context);
return 1; return 1;
} }
@@ -158,7 +156,7 @@ krb5_read (kx_context *kc,
ret = krb5_decrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED, ret = krb5_decrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED,
buf, outer_len, &data); buf, outer_len, &data);
if (ret) { if (ret) {
warnx ("krb5_decrypt: %s", krb5_get_err_text(context, ret)); krb5_warn (context, ret, "krb5_decrypt");
return -1; return -1;
} }
if (data_len > data.length) { if (data_len > data.length) {
@@ -189,7 +187,7 @@ krb5_write(kx_context *kc,
ret = krb5_encrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED, ret = krb5_encrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED,
(void *)buf, len, &data); (void *)buf, len, &data);
if (ret){ if (ret){
warnx ("krb5_write: %s", krb5_get_err_text (context, ret)); krb5_warn (context, ret, "krb5_write");
return -1; return -1;
} }