- updated to latest CVS

Changed files:
    proftpd-wtmp.patch -> 1.11
    proftpd.conf -> 1.3

diff --git a/proftpd-wtmp.patch b/proftpd-wtmp.patch
index f223c0488d1a245d808ae5046b74114035fed11f..283873872d65e57ff965eeb524293d41aaebf818 100644 (file)
--- a/proftpd-wtmp.patch
+++ b/proftpd-wtmp.patch
@@ -1,9 +1,8 @@
-diff -ur proftpd-1.2.0rc2.orig/src/log.c proftpd-1.2.0rc2/src/log.c
---- proftpd-1.2.0rc2.orig/src/log.c    Sat Sep  2 00:36:20 2000
-+++ proftpd-1.2.0rc2/src/log.c Sat Sep  2 01:01:59 2000
-@@ -530,59 +530,22 @@
+--- proftpd-1.2.0rc2/src/log.c~        Sat Feb  3 18:19:05 2001
++++ proftpd-1.2.0rc2/src/log.c Sat Feb  3 18:21:08 2001
+@@ -533,59 +533,22 @@
  
- int log_wtmp(char *line, char *name, char *host, p_in_addr_t *ip)
+ int log_wtmp(char *line, char *name, char *host, struct sockaddr_storage *ip)
  {
 -  struct stat buf;
    struct utmp ut;
@@ -67,8 +66,8 @@ diff -ur proftpd-1.2.0rc2.orig/src/log.c proftpd-1.2.0rc2/src/log.c
 +  memset(&ut,0,sizeof(ut));
  #ifdef HAVE_UTMAXTYPE
  #ifdef LINUX
-     if(ip)
-@@ -612,13 +575,12 @@
+     if(ip) {
+@@ -621,13 +584,12 @@
  #endif /* HAVE_UT_UT_HOST */
  
      time(&ut.ut_time);

diff --git a/proftpd.conf b/proftpd.conf
index 486f2cf4b56efc40aa5342b4089cdb89f353298a..da874f666955826208c7d1fd45db352ed17e6117 100644 (file)
--- a/proftpd.conf
+++ b/proftpd.conf
@@ -8,6 +8,10 @@ ServerType                     inetd
 DeferWelcome                   off
 DefaultServer                  on
 
+# Set this to "on" if you are running in standalone mode!
+UseTCPD                                off
+TCPDServiceName                        ftp
+
 # Port 21 is the standard FTP port.
 Port                           21
 # Umask 022 is a good standard umask to prevent new dirs and files