head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2001.07.19.22.54.08;	author nectar;	state dead;
branches;
next	1.1;

1.1
date	2001.07.19.21.43.42;	author nectar;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Update 0.4b -> 0.4c
@
text
@--- appl/telnet/telnetd/global.c	1997/05/11 06:29:59	1.12
+++ appl/telnet/telnetd/global.c	2001/07/19 16:00:42	1.13
@@@@ -36,7 +36,7 @@@@
 
 #include "telnetd.h"
 
-RCSID("$Id: global.c,v 1.12 1997/05/11 06:29:59 assar Exp $");
+RCSID("$Id: global.c,v 1.13 2001/07/19 16:00:42 assar Exp $");
 
 /*
  * Telnet server variable declarations
@@@@ -93,7 +93,7 @@@@
 output_data (const char *format, ...)
 {
   va_list args;
-  size_t remaining, ret;
+  int remaining, ret;
 
   va_start(args, format);
   remaining = BUFSIZ - (nfrontp - netobuf);
@@@@ -101,7 +101,7 @@@@
 		   remaining,
 		   format,
 		   args);
-  nfrontp += ret;
+  nfrontp += min(ret, remaining-1);
   va_end(args);
   return ret;
 }
@


1.1
log
@= Fix possible telnetd vulnerability in option processing.

Obtained from:	heimdal-discuss@@sics.se

= Fix bug in GSSAPI accept_sec_context() that prevented credential
  forwarding from working in some cases.
@
text
@@

