head	1.11;
access;
symbols
	old_RELEASE_4_5_0:1.10
	old_RELEASE_4_4_0:1.9
	old_RELEASE_4_3_0:1.8
	old_RELEASE_4_2_0:1.8
	old_RELEASE_4_1_1:1.8
	old_RELEASE_4_1_0:1.8
	old_RELEASE_3_5_0:1.8
	old_RELEASE_4_0_0:1.8
	old_RELEASE_3_4_0:1.7
	old_RELEASE_3_3_0:1.7
	old_RELEASE_3_2_0:1.7
	old_RELEASE_3_1_0:1.6
	old_RELEASE_2_2_8:1.6
	old_RELEASE_3_0_0:1.6
	old_RELEASE_2_2_7:1.6
	old_RELEASE_2_2_6:1.6
	old_RELEASE_2_2_5:1.6
	old_RELEASE_2_2_1:1.3
	old_RELEASE_2_2_2:1.4;
locks; strict;
comment	@# @;


1.11
date	2002.02.19.11.41.13;	author ache;	state dead;
branches;
next	1.10;

1.10
date	2001.10.02.19.13.35;	author ache;	state Exp;
branches;
next	1.9;

1.9
date	2001.07.29.21.01.57;	author ache;	state Exp;
branches;
next	1.8;

1.8
date	2000.02.21.01.23.12;	author ache;	state Exp;
branches;
next	1.7;

1.7
date	99.03.09.13.54.45;	author ache;	state Exp;
branches;
next	1.6;

1.6
date	97.09.15.05.48.35;	author ache;	state Exp;
branches;
next	1.5;

1.5
date	97.09.09.23.00.07;	author ache;	state Exp;
branches;
next	1.4;

1.4
date	97.04.27.21.48.53;	author ache;	state Exp;
branches;
next	1.3;

1.3
date	97.01.30.17.00.48;	author ache;	state Exp;
branches;
next	1.2;

1.2
date	97.01.17.09.09.18;	author max;	state Exp;
branches;
next	1.1;

1.1
date	95.10.09.05.27.19;	author gibbs;	state Exp;
branches;
next	;


desc
@@


1.11
log
@Switch to GNU configure

PR:		34660
Submitted by:	"James E. Housley" <jeh@@thehousleys.net>
@
text
@--- config.h.noac.orig	Tue Oct  2 23:07:36 2001
+++ config.h.noac	Tue Oct  2 23:08:15 2001
@@@@ -109,9 +109,7 @@@@
  * Add OPIE support -- REQUIRES OPIE libraries
  */
 
-#if !defined (LINUX)		/* Linux autodetects OPIE */
-#undef OPIE
-#endif
+#define OPIE
 
 /*
  * ALTERNATE_CD
@@@@ -132,7 +130,7 @@@@
  * Define this if you want to use RFC 931 'authentication' - this improves
  * the logging at the cost of a possible slight delay in connection.
  */
-#undef USE_RFC931
+#define USE_RFC931
 
 /*
  * BUFFER_SIZE
@@@@ -232,7 +230,7 @@@@
  * Undefine this to let NOOP reset the idle timeout.
  */
 
-#define IGNORE_NOOP
+#undef IGNORE_NOOP
 
 /*
  * XFERLOG_REALPATH
@@@@ -286,7 +284,7 @@@@
  * the risk of PASV port race stealing the connection.  It also is non-RFC
  * compliant, so it may cause problems for some client sites.
  */
-#define FIGHT_PASV_PORT_RACE
+#undef FIGHT_PASV_PORT_RACE
 
 /*
  * Define this to completely disable anonymous FTP access.
@@@@ -387,4 +385,4 @@@@
  * the NLST command enough to quell complains from Solaris command-
  * line FTP client users.
  */
-#undef NLST_SHOWS_DIRS
+#define NLST_SHOWS_DIRS
@


1.10
log
@Use official patches set
(fix wrong place of pasv-allow fix as result)
@
text
@@


1.9
log
@Switch to OPIE
@
text
@d1 2
a2 2
--- config.h.orig	Sun Jul 29 23:29:57 2001
+++ config.h	Sun Jul 29 23:30:55 2001
d41 6
@


1.8
log
@Turn on RFC931 compiled-in support because it can be turned off (when needed)
in ftpaccess config
@
text
@d1 4
a4 4
--- config.h.orig	Mon Feb 21 03:51:58 2000
+++ config.h	Mon Feb 21 04:18:17 2000
@@@@ -101,7 +101,7 @@@@
  * See FIXES-2.4-HOBBIT for more information on this option.
d7 4
a10 2
-#undef SKEY
+/* #undef SKEY */
d13 2
a14 2
  * OPIE
@@@@ -132,7 +132,7 @@@@
d23 1
a23 1
@@@@ -232,7 +232,7 @@@@
d32 1
a32 1
@@@@ -286,7 +286,7 @@@@
@


1.7
log
@undefine loosing PASV race protection: it not protects well and
not RFC compliant causing problems f.e. for SSH ftp port redirection

enable NOOP
@
text
@d1 3
a3 3
--- config.h.orig	Thu Mar  4 09:45:57 1999
+++ config.h	Tue Mar  9 16:33:39 1999
@@@@ -74,7 +74,7 @@@@
d12 10
a21 1
@@@@ -203,7 +203,7 @@@@
d30 1
a30 1
@@@@ -257,7 +257,7 @@@@
@


1.6
log
@Upgrade to beta-15, nlist hole fixed
@
text
@d1 29
a29 15
*** config.h.orig	Fri Sep 12 19:44:00 1997
--- config.h	Mon Sep 15 09:27:39 1997
***************
*** 72,76 ****
   * See FIXES-2.4-HOBBIT for more information on this option.
   */
  
! #undef SKEY
  
--- 72,76 ----
   * See FIXES-2.4-HOBBIT for more information on this option.
   */
  
! /* #undef SKEY */
  
@


1.5
log
@Upgrade to beta-14
@
text
@d1 2
a2 2
*** config.h.orig	Tue Aug 12 07:42:48 1997
--- config.h	Tue Sep  9 20:18:19 1997
d14 1
a14 1
! #define SKEY
@


1.4
log
@Upgrade to beta-13
@
text
@d1 2
a2 2
*** config.h.bak	Mon Mar  3 12:39:34 1997
--- config.h	Sun Apr 27 21:03:14 1997
d5 1
a5 1
   * See README-2.4-HOBBIT for more information on this option.
d11 1
a11 1
   * See README-2.4-HOBBIT for more information on this option.
@


1.3
log
@Upgrade to Academ 2.4.2-beta-12 as recommended by AUSCERT security
advisory.

P.S. this version is much improved comparing to what we have previously,
f.e. it already contains most of our fixes.
@
text
@d1 2
a2 2
*** config.h.orig	Mon Jan 20 06:21:30 1997
--- config.h	Thu Jan 30 16:13:31 1997
d4 1
a4 18
*** 30,35 ****
--- 30,43 ----
  #define LOG_FAILED
  
  /*
+  * log login attempts that fail because of class connection
+  * limits.  Busy servers may want to prevent this logging
+  * since it can fill up the log file and put a high load on
+  * syslog.
+  */
+ #define LOG_TOOMANY
+ 
+ /*
   * allow use of private file.  (for site group and site gpass)
   */
  
***************
*** 64,68 ****
@


1.2
log
@Rip off the patch to ftpd.c and one to access.c from patch-ai and
merge ftpd.c patch to patch-ad and access.c patch to patch-af.
(As clearly stated in the handbook, a file should be changed only by
one patch.)
@
text
@d1 2
a2 2
*** config.h	Fri Apr  1 11:03:59 1994
--- config.h	Sat Oct  7 10:09:48 1995
d19 13
@


1.1
log
@Tune wu-ftpd for high performance:
- Link ftpd static - big win since it forks so often.
- Turn off push flag to keep sender TCP from sending short packets
  at the boundaries of each write().  Should probably do a SO_SNDBUF
  to set the send buffer size as well, but that may not be desirable
  in heavy-load situations.
- Double the send buffer size.
- Add an option to config.h, LOG_TOOMANY, defined by default, that controls
  whether we bother to complain when a connection hits a user limit.  Turning
  this off removes at least 3/4 of the syslog usage of wu-ftpd on a busy
  system saving CPU and logspace.
- Make SKEY portions truely optional by one knob in the src Makefile

Obtained from: David Greenman <davidg@@FreeBSD.org> and wcarchive
@
text
@a19 54
*** src/access.c	Sat Oct  7 07:52:31 1995
--- src/access.c	Sat Oct  7 10:10:04 1995
***************
*** 803,810 ****
--- 803,812 ----
          acl_join(class);
          return (1);
      } else {
+ #ifdef LOG_TOOMANY
          syslog(LOG_NOTICE, "ACCESS DENIED (user limit %d; class %s) TO %s [%s]",
                 limit, class, remotehost, remoteaddr);
+ #endif
          pr_mesg(msgcode, msgfile);
          return (-1);
      }
*** src/ftpd.c	Sat Oct  7 07:52:30 1995
--- src/ftpd.c	Fri Oct  6 23:48:59 1995
***************
*** 1435,1441 ****
      if (dout == NULL)
          goto done;
  #ifdef HAVE_ST_BLKSIZE
!     send_data(fin, dout, st.st_blksize);
  #else
      send_data(fin, dout, BUFSIZ);
  #endif
--- 1435,1441 ----
      if (dout == NULL)
          goto done;
  #ifdef HAVE_ST_BLKSIZE
!     send_data(fin, dout, st.st_blksize*2);
  #else
      send_data(fin, dout, BUFSIZ);
  #endif
***************
*** 1718,1723 ****
--- 1718,1734 ----
      on = IPTOS_THROUGHPUT;
      if (setsockopt(s, IPPROTO_IP, IP_TOS, (char *) &on, sizeof(int)) < 0)
            syslog(LOG_WARNING, "setsockopt (IP_TOS): %m");
+ #endif
+ #ifdef TCP_NOPUSH
+ 	/*
+ 	 * Turn off push flag to keep sender TCP from sending short packets
+ 	 * at the boundaries of each write().  Should probably do a SO_SNDBUF
+ 	 * to set the send buffer size as well, but that may not be desirable
+ 	 * in heavy-load situations.
+ 	 */
+ 	on = 1;
+ 	if (setsockopt(s, IPPROTO_TCP, TCP_NOPUSH, (char *)&on, sizeof on) < 0)
+ 		syslog(LOG_WARNING, "setsockopt (TCP_NOPUSH): %m");
  #endif
  
      return (fdopen(s, mode));
@
