head	1.3;
access;
symbols
	RELEASE_4_2_0:1.2;
locks; strict;
comment	@# @;


1.3
date	2000.12.14.16.13.47;	author nectar;	state dead;
branches;
next	1.2;

1.2
date	2000.11.03.16.37.35;	author nectar;	state Exp;
branches;
next	1.1;

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


desc
@@


1.3
log
@Update 0.3c -> 0.3d
@
text
@--- appl/ftp/ftp/security.c.orig	Sun Feb  6 21:11:43 2000
+++ appl/ftp/ftp/security.c	Fri Nov  3 10:11:47 2000
@@@@ -237,7 +237,7 @@@@
 	ret = sec_get_data(fd, &in_buffer, data_prot);
 	if (ret < 0)
 	    return -1;
-	if(ret == 0 || in_buffer.size == 0) {
+	if(ret == 0 && in_buffer.size == 0) {
 	    if(rx)
 		in_buffer.eof_flag = 1;
 	    return rx;
@


1.2
log
@(This is a forced commit ... the previous commit went through with an
 empty log message.)

Bug fix for FTP client:  Make integrity protection and encryption for
the data channel work when requested.
@
text
@@


1.1
log
@*** empty log message ***
@
text
@@
