[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc4-110-gc47ae94

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit c47ae94c4a0e70355c2c7ab1d3383d1c0ff4f4fe
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 30 13:56:15 2014 +0100

    Refreshed two more fuzzy patches.

diff --git a/debian/patches/ftpstats b/debian/patches/ftpstats
index b58a1c2..f99f56e 100644
--- a/debian/patches/ftpstats
+++ b/debian/patches/ftpstats
@@ -5,9 +5,9 @@ Bug-Debian: http://bugs.debian.org/378826
 
 Index: proftpd-dfsg/contrib/xferstats.holger-preiss
 ===================================================================
---- proftpd-dfsg.orig/contrib/xferstats.holger-preiss	2013-01-08 15:45:23.000000000 +0100
-+++ proftpd-dfsg/contrib/xferstats.holger-preiss	2013-01-08 15:45:52.000000000 +0100
-@@ -51,7 +51,7 @@
+--- proftpd-dfsg.orig/contrib/xferstats.holger-preiss	2014-01-30 13:55:47.000000000 +0100
++++ proftpd-dfsg/contrib/xferstats.holger-preiss	2014-01-30 13:55:47.000000000 +0100
+@@ -58,7 +58,7 @@
  # $mydom2 = "org";
  
  # edit the next line to customize for your default log file
diff --git a/debian/patches/silent b/debian/patches/silent
index 253df5a..302326b 100644
--- a/debian/patches/silent
+++ b/debian/patches/silent
@@ -5,9 +5,9 @@ Forwarded: not needed
 
 Index: proftpd-dfsg/src/dirtree.c
 ===================================================================
---- proftpd-dfsg.orig/src/dirtree.c	2013-06-24 17:56:32.000000000 +0200
-+++ proftpd-dfsg/src/dirtree.c	2013-06-24 17:56:32.000000000 +0200
-@@ -3262,9 +3262,6 @@
+--- proftpd-dfsg.orig/src/dirtree.c	2014-01-30 13:55:12.000000000 +0100
++++ proftpd-dfsg/src/dirtree.c	2014-01-30 13:55:12.000000000 +0100
+@@ -3323,9 +3323,6 @@
        }
      }
  
@@ -15,5 +15,5 @@ Index: proftpd-dfsg/src/dirtree.c
 -      dup_path);
 -
      dirh = pr_fsio_opendir(dup_path);
-     if (!dirh) {
-       pr_log_pri(PR_LOG_ERR,
+     if (dirh == NULL) {
+       pr_log_pri(PR_LOG_WARNING,

-- 
ProFTPD core package