-diff -Nur proftpd-1.2.0pre3/contrib/xferstats.holger-preiss proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss
--- proftpd-1.2.0pre3/contrib/xferstats.holger-preiss Sun Oct 18 04:24:41 1998
+++ proftpd-1.2.0pre3.pld/contrib/xferstats.holger-preiss Fri May 28 10:49:08 1999
@@ -1,4 +1,4 @@
# $mydom2 = "org";
# edit the next line to customize for your default log file
-diff -Nur proftpd-1.2.0pre3/include/default_paths.h proftpd-1.2.0pre3.pld/include/default_paths.h
---- proftpd-1.2.0pre3/include/default_paths.h Sun Oct 18 04:24:41 1998
-+++ proftpd-1.2.0pre3.pld/include/default_paths.h Fri May 28 10:47:56 1999
-@@ -30,7 +30,7 @@
- * ftpcount, ftpwho, etc.
- */
- #ifndef RUN_DIR
--#define RUN_DIR "/var/run/proftpd"
-+#define RUN_DIR "/var/run"
- #endif
-
- /* The location you wish to place any core files produced as a result of
-@@ -51,7 +51,7 @@
+--- proftpd-1.3.0/include/default_paths.h~ 2006-04-29 14:05:26.906490255 +0300
++++ proftpd-1.3.0/include/default_paths.h 2006-04-29 14:06:53.778425641 +0300
+@@ -57,7 +57,7 @@
* overriden at runtime with the '-c' switch
*/
- #ifndef CONFIG_FILE_PATH
--#define CONFIG_FILE_PATH "/etc/proftpd.conf"
-+#define CONFIG_FILE_PATH "/etc/ftpd/proftpd.conf"
+ #ifndef PR_CONFIG_FILE_PATH
+-# define PR_CONFIG_FILE_PATH "/etc/proftpd.conf"
++# define PR_CONFIG_FILE_PATH "/etc/ftpd/proftpd.conf"
#endif
/* The location of your `shells' file; a newline delimited list of
-@@ -75,6 +75,6 @@
+@@ -80,6 +80,6 @@
/* Location of the file containing users that *cannot* use ftp
* services (odd, eh?)
*/
--#define FTPUSERS_PATH "/etc/ftpusers"
-+#define FTPUSERS_PATH "/etc/ftpd/ftpusers"
+-#define PR_FTPUSERS_PATH "/etc/ftpusers"
++#define PR_FTPUSERS_PATH "/etc/ftpd/ftpusers"
#endif /* PROFTPD_PATHS_H */
---- proftpd-1.2.0rc2/configure.in~ Sun Sep 17 07:09:08 2000
-+++ proftpd-1.2.0rc2/configure.in Sun Sep 17 07:10:35 2000
-@@ -1184,13 +1184,6 @@
- test "x$prefix" = xNONE && prefix=$ac_default_prefix
- test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
--AC_DEFINE_UNQUOTED(CONFIG_FILE_PATH,
-- "`eval echo "${sysconfdir}/proftpd.conf"`")
--AC_DEFINE_UNQUOTED(PID_FILE_PATH,
-- "`eval echo "${localstatedir}/proftpd.pid"`")
--AC_DEFINE_UNQUOTED(RUN_DIR,
-- "`eval echo "${localstatedir}/proftpd"`")
--
- prefix="$pr_saved_prefix"
- exec_prefix="$pr_saved_exec_prefix"
-
-diff -urN proftpd-1.2.10/include/data.h proftpd-1.2.10-sendfile64/include/data.h
---- proftpd-1.2.10/include/data.h 2004-05-21 19:19:02.000000000 +0200
-+++ proftpd-1.2.10-sendfile64/include/data.h 2005-02-03 17:18:39.676660624 +0100
+--- proftpd-1.3.0/include/data.h~ 2006-04-29 14:20:36.776770520 +0300
++++ proftpd-1.3.0/include/data.h 2006-04-29 14:21:59.528616003 +0300
@@ -36,25 +36,12 @@
int pr_data_open(char *, char *, int, off_t);
void pr_data_close(int);
-
-pr_sendfile_t;
-
--pr_sendfile_t pr_data_sendfile(int retr_fd, off_t *offset, size_t count);
+-pr_sendfile_t pr_data_sendfile(int retr_fd, off_t *offset, off_t count);
+off_t pr_data_sendfile(int retr_fd, off_t *offset, off_t count);
#endif /* HAVE_SENDFILE */
#endif /* PR_DATACONN_H */
-diff -urN proftpd-1.2.10/modules/mod_xfer.c proftpd-1.2.10-sendfile64/modules/mod_xfer.c
--- proftpd-1.2.10/modules/mod_xfer.c 2004-08-25 00:24:18.000000000 +0200
+++ proftpd-1.2.10-sendfile64/modules/mod_xfer.c 2005-02-03 17:18:26.109723112 +0100
@@ -603,7 +603,7 @@
/* This function sets static module variables for later potential
* throttling of the transfer.
-diff -urN proftpd-1.2.10/src/data.c proftpd-1.2.10-sendfile64/src/data.c
--- proftpd-1.2.10/src/data.c 2004-08-25 20:08:46.000000000 +0200
+++ proftpd-1.2.10-sendfile64/src/data.c 2005-02-03 17:20:56.858805768 +0100
@@ -772,9 +772,9 @@
---- proftpd-1.2.10rc3/src/log.c.orig 2004-04-20 04:05:41.000000000 +0200
-+++ proftpd-1.2.10rc3/src/log.c 2004-09-01 08:26:12.959741640 +0200
-@@ -54,27 +54,16 @@
+--- proftpd-1.3.0/src/log.c 2005-11-14 18:33:06.000000000 +0200
++++ proftpd-1.3.0.utmp/src/log.c 2006-04-29 14:17:55.023163252 +0300
+@@ -54,31 +54,13 @@
int log_wtmp(char *line, const char *name, const char *host,
pr_netaddr_t *ip) {
struct utmp ut;
int res = 0;
- static int fd = -1;
++ static int washere = 0;
--#if (defined(SVR4) || defined(__SVR4)) && \
+-#if ((defined(SVR4) || defined(__SVR4)) || \
+- (defined(__NetBSD__) && defined(HAVE_UTMPX_H))) && \
- !(defined(LINUX) || defined(__hpux) || defined (_AIX))
- /* This "auxilliary" utmp doesn't exist under linux. */
-#ifdef __sparcv9
-#endif
- static int fdx = -1;
-
+-#if !defined(WTMPX_FILE) && defined(_PATH_WTMPX)
+-# define WTMPX_FILE _PATH_WTMPX
+-#endif
+-
- if (fdx < 0 &&
- (fdx = open(WTMPX_FILE, O_WRONLY|O_APPEND, 0)) < 0) {
- pr_log_pri(PR_LOG_WARNING, "wtmpx %s: %s", WTMPX_FILE, strerror(errno));
- return -1;
-- }
-+ static int washere = 0;
-+
+ if (!washere) {
+ utmpname(_PATH_WTMP);
+ washere = 1;
-+ } else
-+ washere = 0;
+ }
/* Unfortunately, utmp string fields are terminated by '\0' if they are
- * shorter than the size of the field, but if they are exactly the size of
-@@ -82,46 +71,6 @@
+@@ -87,52 +69,7 @@
* Insane if you ask me. Unless there's massive uproar, I prefer to err on
* the side of caution and always null-terminate our strings.
*/
- sstrncpy(utx.ut_id, "ftp", sizeof(utx.ut_user));
- sstrncpy(utx.ut_line, line, sizeof(utx.ut_line));
- sstrncpy(utx.ut_host, host, sizeof(utx.ut_host));
-- utx.ut_syslen = strlen(utx.ut_host)+1;
- utx.ut_pid = getpid();
--#ifdef __sparcv9
+-#if defined(__NetBSD__) && defined(HAVE_UTMPX_H)
+- memcpy(&utx.ut_ss, pr_netaddr_get_inaddr(ip), sizeof(utx.ut_ss));
+- gettimeofday(&utx.ut_tv, NULL);
+-#else /* SVR4 */
+- utx.ut_syslen = strlen(utx.ut_host)+1;
+-# ifdef __sparcv9
- time(&t);
- utx.ut_tv.tv_sec = (time32_t)t;
--#else
+-# else
- time(&utx.ut_tv.tv_sec);
--#endif
+-# endif
+-#endif /* SVR4 */
+-
- if (*name)
- utx.ut_type = USER_PROCESS;
- else
- pr_log_pri(PR_LOG_WARNING, "wtmp %s: %s", WTMP_FILE, strerror(errno));
- return -1;
- }
--
+
- if (fstat(fd, &buf) == 0) {
memset(&ut, 0, sizeof(ut));
#ifdef HAVE_UTMAXTYPE
# ifdef LINUX
-@@ -158,15 +107,12 @@
+@@ -169,15 +106,12 @@
#endif /* HAVE_UT_UT_HOST */
time(&ut.ut_time);
# "nobody" and "ftp" for normal operation and anon.
ServerName "ProFTPD"
-ServerIdent off
-ServerType inetd
+ServerType standalone
DeferWelcome off
DefaultServer on
# want to uncomment the next line
#MultilineRFC2228 on
-# TCPD configuration
-# TCPServiceName ftp
-#TCPAccessFiles None
-#TCPAccessSyslogLevels info warn
-#TCPGroupAccessFiles None
-#TCPUserAccessFiles None
-
# These are the TLS related options, default values
-#TLSEngine off
-#TLSProtocol SSLv23
-#TLSCipherSuite ALL:!ADH
-#TLSRSACertificateFile None
-#TLSRSACertificateKeyFile None
-#TLSDSACertficateFile None
-#TLSDSACertificateKeyFile None
-#TLSCACertificateFile None
-#TLSCACertificatePath None
-#TLSCARevocationFile None
-#TLSCARevocationPath None
-#TLSCertificateChainFile None
-#TLSDHParamFile None
-#TLSLog None
-#TLSOptions None
-#TLSRandomSeed openssl-dir/.rnd
-#TLSRenegotiate None
-#TLSRequired None
-#TLSTimeoutHandshake 300
-#TLSVerifyClient None
-#TLSVerifyDepth 9
+#TLSRSACertificateFile ftpd-rsa.pem
+#TLSRSACertificateKeyFile ftpd-rsa-key.pem
+#TLSDSACertificateFile ftpd-dsa.pem
+#TLSDSACertificateKeyFile ftpd-dsa-key.pem
+#TLSCARevocationFile ftpd-crl.pem
+#TLSDHParamFile ftpd-dhparam.pem
+#TLSCipherSuite ALL:!EXP
+# don't verify any peer certificates
+#TLSVerifyClient off
# Port 21 is the standard FTP port.
Port 21
User ftp
Group ftp
-# use PAM authoritative
-AuthPAM on
+# Load additional modules config
+Include /etc/ftpd/conf.d/*.conf
# Normally, we want files to be overwriteable.
<Directory />
AllowOverwrite on
</Directory>
-#A basic anonymous configuration
+# A basic anonymous configuration
# uncoment this section below if you want gain annonymous ftp acces
<Anonymous ~ftp>
User ftp
# </Limit>
# </Directory>
</Anonymous>
+
+# vim:ts=8:sw=8
projects / packages / proftpd.git / commitdiff