Rel 5; pure-uploadscript retval has meaning only if it is enabled

[packages/pure-ftpd.git] / pure-ftpd-allauth.patch

diff --git a/pure-ftpd-allauth.patch b/pure-ftpd-allauth.patch
index 0c8678881e65de3cf3659717a62236d78fdf860b..7a56b985afc3460895d92dc203325e9e4be8092a 100644 (file)
--- a/pure-ftpd-allauth.patch
+++ b/pure-ftpd-allauth.patch
@@ -1,20 +1,20 @@
---- a/src/log_mysql.c~ 2015-07-02 14:57:00.000000000 +0200
-+++ b/src/log_mysql.c  2015-07-02 14:57:43.001711520 +0200
-@@ -438,6 +438,7 @@ void pw_mysql_check(AuthResult * const r
+--- pure-ftpd-1.0.47/src/log_mysql.c~  2017-08-20 16:51:05.000000000 +0200
++++ pure-ftpd-1.0.47/src/log_mysql.c   2017-10-28 20:17:43.638635689 +0200
+@@ -429,6 +429,7 @@ void pw_mysql_check(AuthResult * const r
          crypto_mysql++;
          crypto_md5++;
          crypto_sha1++;
 +        crypto_plain++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2) == 0) {
+         crypto_argon2++;
      } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) {
-         crypto_scrypt++;
-     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {
---- a/src/log_pgsql.c~ 2015-07-02 14:57:00.000000000 +0200
-+++ b/src/log_pgsql.c  2015-07-02 14:57:55.612037841 +0200
-@@ -506,6 +506,7 @@ void pw_pgsql_check(AuthResult * const r
+--- pure-ftpd-1.0.47/src/log_pgsql.c~  2017-08-20 16:51:15.000000000 +0200
++++ pure-ftpd-1.0.47/src/log_pgsql.c   2017-10-28 20:18:08.135958914 +0200
+@@ -504,6 +504,7 @@ void pw_pgsql_check(AuthResult * const r
          crypto_crypt++;
          crypto_md5++;
          crypto_sha1++;
 +        crypto_plain++;
+     } else if (strcasecmp(crypto, PASSWD_SQL_ARGON2) == 0) {
+         crypto_argon2++;
      } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) {
-         crypto_scrypt++;
-     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {