From: Tom Yu <tlyu@mit.edu>
Date: Fri, 26 Feb 1999 04:35:09 +0000 (+0000)
Subject: 	* ftpd.c (reply): Don't call secure_gss_error() or secure_error()
X-Git-Tag: krb5-1.1-beta1~319
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8d3f2e17ca8a042ba641502967b2d74d9c5701e3;p=krb5.git

	* ftpd.c (reply): Don't call secure_gss_error() or secure_error()
	from within reply() to avoid setting up an infinite
	loop. [krb5-appl/684]

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11230 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index eab64226d..d0bc86428 100644
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 25 23:31:37 1999  Tom Yu  <tlyu@mit.edu>
+
+	* ftpd.c (reply): Don't call secure_gss_error() or secure_error()
+	from within reply() to avoid setting up an infinite
+	loop. [krb5-appl/684]
+
 Thu Feb 18 18:34:23 1999  Tom Yu  <tlyu@mit.edu>
 
 	* ftpd.c (login): Add call to setluid() if necessary.
diff --git a/src/appl/gssftp/ftpd/ftpd.c b/src/appl/gssftp/ftpd/ftpd.c
index 1adad89ef..5ca60871d 100644
--- a/src/appl/gssftp/ftpd/ftpd.c
+++ b/src/appl/gssftp/ftpd/ftpd.c
@@ -1729,13 +1729,19 @@ reply(n, fmt, p0, p1, p2, p3, p4, p5)
 					    &in_buf, &conf_state,
 					    &out_buf);
 			if (maj_stat != GSS_S_COMPLETE) {
+#if 0
+/* Don't setup an infinite loop */
 				/* generally need to deal */
 				secure_gss_error(maj_stat, min_stat,
 					       (clevel==PROT_P)?
 						 "gss_seal ENC didn't complete":
 						 "gss_seal MIC didn't complete");
+#endif /* 0 */
 			} else if ((clevel == PROT_P) && !conf_state) {
+#if 0
+/* Don't setup an infinite loop */
 				secure_error("GSSAPI didn't encrypt message");
+#endif /* 0 */
 			} else {
 				memcpy(out, out_buf.value, 
 				       length=out_buf.length);