* 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 eab64226ded516a0efd7aebdd72fff1be7dc9165..d0bc86428d1eea279d6de3ccda7f80ccbc4df57e 100644 (file)
--- 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 1adad89ef2eb35deea5f134b2bfcc8d99cbd2660..5ca60871d1abfcc06cbb5d390a0296496c08f18d 100644 (file)
--- 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);