From 84783aa90fc25231e11555fc49685e0da3ec1b7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= <lha@kth.se>
Date: Tue, 31 Jul 2007 20:42:20 +0000
Subject: [PATCH] (krb5_rd_priv): clear error string.

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@21751 ec53bebd-3082-4978-b11e-865c3cabbd6b
---
 lib/krb5/rd_priv.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/krb5/rd_priv.c b/lib/krb5/rd_priv.c
index 4cfc87054..f1edfbbb8 100644
--- a/lib/krb5/rd_priv.c
+++ b/lib/krb5/rd_priv.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997-2003 Kungliga Tekniska Högskolan
+ * Copyright (c) 1997-2007 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden). 
  * All rights reserved. 
  *
@@ -55,13 +55,17 @@ krb5_rd_priv(krb5_context context,
 
     if ((auth_context->flags & 
 	 (KRB5_AUTH_CONTEXT_RET_TIME | KRB5_AUTH_CONTEXT_RET_SEQUENCE)) &&
-	outdata == NULL)
+	outdata == NULL) {
+	krb5_clear_error_string (context);
 	return KRB5_RC_REQUIRED; /* XXX better error, MIT returns this */
+    }
 
     memset(&priv, 0, sizeof(priv));
     ret = decode_KRB_PRIV (inbuf->data, inbuf->length, &priv, &len);
-    if (ret) 
+    if (ret) {
+	krb5_clear_error_string (context);
 	goto failure;
+    }
     if (priv.pvno != 5) {
 	krb5_clear_error_string (context);
 	ret = KRB5KRB_AP_ERR_BADVERSION;
@@ -94,8 +98,10 @@ krb5_rd_priv(krb5_context context,
 
     ret = decode_EncKrbPrivPart (plain.data, plain.length, &part, &len);
     krb5_data_free (&plain);
-    if (ret) 
+    if (ret) {
+	krb5_clear_error_string (context);
 	goto failure;
+    }
   
     /* check sender address */