* ftp.c (getreply): Restore proper setting of safe. This variable

	was previously being set to the value of code rather than to the
	boolean expression (code == 631), which it had been previously.
	The bug resulted in all replies from the server being parsed as
	krb_safe messages even when they were krb_priv messages.

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

diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog
index 2bad1481dbba5d2a6094a5bdb32aa86989ab3e60..473c9ad45b75fafe86e82e8135c664a11f43fa84 100644 (file)
--- a/src/appl/gssftp/ftp/ChangeLog
+++ b/src/appl/gssftp/ftp/ChangeLog
@@ -1,3 +1,11 @@
+Fri Aug  7 11:45:17 1998  Tom Yu  <tlyu@mit.edu>
+
+       * ftp.c (getreply): Restore proper setting of safe.  This variable
+       was previously being set to the value of code rather than to the
+       boolean expression (code == 631), which it had been previously.
+       The bug resulted in all replies from the server being parsed as
+       krb_safe messages even when they were krb_priv messages.
+
 1998-05-06  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * radix.c (argv): POSIX states that getopt returns -1 when it

diff --git a/src/appl/gssftp/ftp/ftp.c b/src/appl/gssftp/ftp/ftp.c
index 2fbe8e468d7a02470a9210a29fa2cc20f2e8a6de..85e01b5dddc7c2be06c4659ca731b66cbe38ecd2 100644 (file)
--- a/src/appl/gssftp/ftp/ftp.c
+++ b/src/appl/gssftp/ftp/ftp.c
@@ -597,7 +597,7 @@ getreply(expecteof)
                    if (code != 631 && code != 632 && code != 633) {
                        printf("Unknown reply: %d %s\n", code, obuf);
                        n = '5';
-                   } else safe = code;
+                   } else safe = (code == 631);
                if (obuf[0])    /* if there is a string to decode */
                    if (!auth_type) {
                        printf("Cannot decode reply:\n%d %s\n", code, obuf);