diff options
author | nectar <nectar@FreeBSD.org> | 2002-08-30 21:23:27 +0000 |
---|---|---|
committer | nectar <nectar@FreeBSD.org> | 2002-08-30 21:23:27 +0000 |
commit | a77dba08ca7d8ad2f2dcd653974ac66df78cfa49 (patch) | |
tree | 6015f89700252fb05eb8fa267c46dba41913e9d8 /crypto/heimdal/appl/kx/krb5.c | |
parent | 69a91bec14ec3ad49d1c8a82c40a796755f9e4a3 (diff) | |
download | FreeBSD-src-a77dba08ca7d8ad2f2dcd653974ac66df78cfa49.zip FreeBSD-src-a77dba08ca7d8ad2f2dcd653974ac66df78cfa49.tar.gz |
Import of Heimdal Kerberos from KTH repository circa 2002/08/29.
Diffstat (limited to 'crypto/heimdal/appl/kx/krb5.c')
-rw-r--r-- | crypto/heimdal/appl/kx/krb5.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/crypto/heimdal/appl/kx/krb5.c b/crypto/heimdal/appl/kx/krb5.c index 0b4a083..509bcb2 100644 --- a/crypto/heimdal/appl/kx/krb5.c +++ b/crypto/heimdal/appl/kx/krb5.c @@ -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). * All rights reserved. * @@ -33,7 +33,7 @@ #include "kx.h" -RCSID("$Id: krb5.c,v 1.7 2000/12/31 07:32:03 assar Exp $"); +RCSID("$Id: krb5.c,v 1.9 2002/05/24 15:13:52 joda Exp $"); #ifdef KRB5 @@ -84,8 +84,7 @@ krb5_authenticate (kx_context *kc, int s) ret = krb5_sname_to_principal (context, host, "host", KRB5_NT_SRV_HST, &server); if (ret) { - warnx ("krb5_sname_to_principal: %s: %s", host, - krb5_get_err_text(context, ret)); + krb5_warn (context, ret, "krb5_sname_to_principal: %s", host); return 1; } @@ -103,22 +102,21 @@ krb5_authenticate (kx_context *kc, int s) NULL, NULL); if (ret) { - warnx ("krb5_sendauth: %s: %s", host, - krb5_get_err_text(context, ret)); + if(ret != KRB5_SENDAUTH_BADRESPONSE) + krb5_warn (context, ret, "krb5_sendauth: %s", host); return 1; } ret = krb5_auth_con_getkey (context, auth_context, &c->keyblock); if (ret) { - warnx ("krb5_auth_con_getkey: %s: %s", host, - krb5_get_err_text(context, ret)); + krb5_warn (context, ret, "krb5_auth_con_getkey: %s", host); krb5_auth_con_free (context, auth_context); return 1; } ret = krb5_crypto_init (context, c->keyblock, 0, &c->crypto); 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); return 1; } @@ -158,7 +156,7 @@ krb5_read (kx_context *kc, ret = krb5_decrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED, buf, outer_len, &data); if (ret) { - warnx ("krb5_decrypt: %s", krb5_get_err_text(context, ret)); + krb5_warn (context, ret, "krb5_decrypt"); return -1; } if (data_len > data.length) { @@ -189,7 +187,7 @@ krb5_write(kx_context *kc, ret = krb5_encrypt (context, c->crypto, KRB5_KU_OTHER_ENCRYPTED, (void *)buf, len, &data); if (ret){ - warnx ("krb5_write: %s", krb5_get_err_text (context, ret)); + krb5_warn (context, ret, "krb5_write"); return -1; } |