From: Tom Yu <tlyu@mit.edu>
Date: Tue, 19 Dec 2006 05:05:41 +0000 (+0000)
Subject: pull up r18977 from trunk
X-Git-Tag: krb5-1.6-beta2~10
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=a32f911c2666e51b9defa1d62c97319130ccf42d;p=krb5.git

pull up r18977 from trunk

 r18977@cathode-dark-space:  tlyu | 2006-12-18 23:16:30 -0500
 ticket: new
 target_version: 1.6
 tags: pullup
 component: krb5-libs
 subject: use KRB5KRB_ERR_GENERIC, not KRB_ERR_GENERIC in preauth2.c

 	* src/lib/krb5/krb/preauth2.c (krb5_do_preauth_tryagain): Use
 	KRB5KRB_ERR_GENERIC, not KRB_ERR_GENERIC.


ticket: 5124
version_fixed: 1.6

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@18980 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/krb/preauth2.c b/src/lib/krb5/krb/preauth2.c
index fc1bc71da..7bcfff6f2 100644
--- a/src/lib/krb5/krb/preauth2.c
+++ b/src/lib/krb5/krb/preauth2.c
@@ -1308,13 +1308,13 @@ krb5_do_preauth_tryagain(krb5_context kcontext,
     int i, j;
     int out_pa_list_size = 0;
 
-    ret = KRB_ERR_GENERIC;
+    ret = KRB5KRB_ERR_GENERIC;
     if (kcontext->preauth_context == NULL) {
-       return KRB_ERR_GENERIC;
+       return KRB5KRB_ERR_GENERIC;
     }
     context = kcontext->preauth_context;
     if (context == NULL) {
-       return KRB_ERR_GENERIC;
+       return KRB5KRB_ERR_GENERIC;
     }
 
     for (i = 0; padata[i] != NULL && padata[i]->pa_type != 0; i++) {