Increase buffer sizes to 64K where a Kerberos 5 authenticator might be

exchanged.  Suggested by Markus Moeller.

ticket: 2615

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

diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in
index 5124834699711624a9b7ead642642458a367f377..ded4c95dad5bfce234529518ef2d6d3708b407cf 100644 (file)
--- a/src/appl/gssftp/ftp/Makefile.in
+++ b/src/appl/gssftp/ftp/Makefile.in
@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 #
 # appl/gssftp/ftp/Makefile.in
 #
-DEFINES = -DGSSAPI -DFTP_BUFSIZ=10240
+DEFINES = -DGSSAPI -DFTP_BUFSIZ=65535
 PROG_LIBPATH=-L$(TOPLIBD)
 PROG_RPATH=$(KRB5_LIBDIR)
 

diff --git a/src/appl/telnet/libtelnet/Makefile.in b/src/appl/telnet/libtelnet/Makefile.in
index aec819d7323c9f7c055e9ed75274a2bdc40d0b90..a52071c0729f1ed077856fe59cf0313276e4de8f 100644 (file)
--- a/src/appl/telnet/libtelnet/Makefile.in
+++ b/src/appl/telnet/libtelnet/Makefile.in
@@ -26,7 +26,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DDES_ENCRYPTION -DKRB5 -DFORWARD \
        -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 LOCALINCLUDES=-I.. -I$(srcdir)/.. @KRB4_INCLUDES@
-DEFINES = $(AUTH_DEF)
+DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF)
 LIBOBJS=@LIBOBJS@
 
 SETENVSRC=@SETENVSRC@

diff --git a/src/appl/telnet/libtelnet/kerberos5.c b/src/appl/telnet/libtelnet/kerberos5.c
index ad36aedda24a8658f2469cfdedf3ffbbd593f02b..ab8e04d3c47c62a8563052e3c0e2e9ee73ed4846 100644 (file)
--- a/src/appl/telnet/libtelnet/kerberos5.c
+++ b/src/appl/telnet/libtelnet/kerberos5.c
@@ -99,7 +99,7 @@ static void kerberos5_forward(Authenticator *);
 
 #endif /* FORWARD */
 
-static unsigned char str_data[8192] = {IAC, SB, TELOPT_AUTHENTICATION, 0,
+static unsigned char str_data[TELNET_BUFSIZE] = {IAC, SB, TELOPT_AUTHENTICATION, 0,
                                        AUTHTYPE_KERBEROS_V5, };
 /*static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
                                        TELQUAL_NAME, };*/

diff --git a/src/appl/telnet/telnet/Makefile.in b/src/appl/telnet/telnet/Makefile.in
index 5e7b6c028d92bdf068924ad95322aba45ba256ca..42a0578999b016fbf66ccb1841b75a49cbcab8eb 100644 (file)
--- a/src/appl/telnet/telnet/Makefile.in
+++ b/src/appl/telnet/telnet/Makefile.in
@@ -27,7 +27,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -DLOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DLINEMODE -DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
-DEFINES = $(AUTH_DEF) $(OTHERDEFS)
+DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
 PROG_LIBPATH=-L$(TOPLIBD)

diff --git a/src/appl/telnet/telnet/network.c b/src/appl/telnet/telnet/network.c
index 1282bdb7eee57ae215b46c8c8f7d5239dd3dc91f..60dc3bdcf6221f0cc12cfba8ecbb0995873f48ce 100644 (file)
--- a/src/appl/telnet/telnet/network.c
+++ b/src/appl/telnet/telnet/network.c
@@ -52,7 +52,7 @@
 #include "fdset.h"
 
 Ring           netoring, netiring;
-unsigned char  netobuf[2*BUFSIZ], netibuf[BUFSIZ];
+unsigned char  netobuf[2*TELNET_BUFSIZE], netibuf[TELNET_BUFSIZE];
 
 /*
  * Initialize internal network data structures.

diff --git a/src/appl/telnet/telnetd/Makefile.in b/src/appl/telnet/telnetd/Makefile.in
index c1368629bd799582958677202d0b29b43829c040..0b19dd3698e4e16d5544d099f94accc3d881c54a 100644 (file)
--- a/src/appl/telnet/telnetd/Makefile.in
+++ b/src/appl/telnet/telnetd/Makefile.in
@@ -27,7 +27,7 @@ BUILDTOP=$(REL)..$(S)..$(S)..
 AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
 OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
 LOCALINCLUDES=-I.. -I$(srcdir)/..
-DEFINES = $(AUTH_DEF) $(OTHERDEFS)
+DEFINES = -DTELNET_BUFSIZE=65535 $(AUTH_DEF) $(OTHERDEFS)
 ARPA_TELNET= $(srcdir)/../arpa/telnet.h
 
 PROG_LIBPATH=-L$(TOPLIBD) $(KRB4_LIBPATH)

diff --git a/src/appl/telnet/telnetd/state.c b/src/appl/telnet/telnetd/state.c
index b01842f006fb1151c6c306a859f4361b80511c64..e08c5bb13ad035348085b06c88c8f21afe2ee2ac 100644 (file)
--- a/src/appl/telnet/telnetd/state.c
+++ b/src/appl/telnet/telnetd/state.c
@@ -53,7 +53,7 @@ static int envvarok (char *);
  * Buffer for sub-options, and macros
  * for suboptions buffer manipulations
  */
-unsigned char subbuffer[4096], *subpointer= subbuffer, *subend= subbuffer;
+unsigned char subbuffer[TELNET_BUFSIZE], *subpointer= subbuffer, *subend= subbuffer;
 
 #define        SB_CLEAR()      subpointer = subbuffer
 #define        SB_TERM()       { subend = subpointer; SB_CLEAR(); }