From a51951c17a10d4aa696c2d4b7b3285208245371e Mon Sep 17 00:00:00 2001
From: Johan Danielsson <joda@pdc.kth.se>
Date: Tue, 7 May 2002 08:53:36 +0000
Subject: [PATCH] use krb5_warn where appropriate

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10969 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 appl/kx/krb5.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/appl/kx/krb5.c b/appl/kx/krb5.c
index 790c8a314..1d98b8440 100644
--- a/appl/kx/krb5.c
+++ b/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.
  * 
@@ -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;
     }