pullup from trunk

ticket: 2783
version_fixed: 1.4

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

diff --git a/src/appl/gssftp/ftpd/ChangeLog b/src/appl/gssftp/ftpd/ChangeLog
index 58fab439b2e9bc27f6f5f51fc9f1f8627c7b7f8b..f9ac141618823a1b0017977bfba4f36efc2a3c1a 100644 (file)
--- a/src/appl/gssftp/ftpd/ChangeLog
+++ b/src/appl/gssftp/ftpd/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-26  Sam Hartman  <hartmans@mit.edu>
+
+       * ftpcmd.y: nbby should be 8 for anything platform we care about.
+       The previous test broke on Debian BSD, so the test has been
+       removed. 
+
 2004-11-03  Tom Yu  <tlyu@mit.edu>
 
        * ftpcmd.y (getline): Merge Athena change to reject MICed

diff --git a/src/appl/gssftp/ftpd/ftpcmd.y b/src/appl/gssftp/ftpd/ftpcmd.y
index bb6bbcddeca18c06491da32848a49db19a6fe7d8..096014bd22e66a865a5df978dc3bd23d25b35709 100644 (file)
--- a/src/appl/gssftp/ftpd/ftpcmd.y
+++ b/src/appl/gssftp/ftpd/ftpcmd.y
@@ -96,15 +96,8 @@ extern gss_ctx_id_t gcontext;
 #endif
 
 #ifndef NBBY
-#ifdef linux
 #define NBBY 8
 #endif
-#ifdef __pyrsoft
-#ifdef MIPSEB
-#define NBBY 8
-#endif
-#endif
-#endif
 
 static struct sockaddr_in host_port;