- more accurate comments on PAM configuration; system-auth for session with

[packages/proftpd.git] / proftpd-paths.patch

diff --git a/proftpd-paths.patch b/proftpd-paths.patch
index 17705c8d55236c65573a818372d00af16f063ca4..fcc323179c73915827925709c5b148c63af0730a 100644 (file)
--- a/proftpd-paths.patch
+++ b/proftpd-paths.patch
@@ -1,4 +1,3 @@
-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 @@
@@ -16,23 +15,22 @@ diff -Nur proftpd-1.2.0pre3/contrib/xferstats.holger-preiss proftpd-1.2.0pre3.pl
  # $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
-@@ -17,7 +17,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
-@@ -41,6 +41,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 */