- up to 1.0.46; additionalgid no longer in use; passwd_location was wrong anyway...

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

diff --git a/pure-ftpd-allauth.patch b/pure-ftpd-allauth.patch
index 0c8678881e65de3cf3659717a62236d78fdf860b..054931d42b6dd072f23bbe63e9f4b263e5168d81 100644 (file)
--- a/pure-ftpd-allauth.patch
+++ b/pure-ftpd-allauth.patch
@@ -1,20 +1,21 @@
---- 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
+--- a/src/log_mysql.c~ 2017-04-24 16:32:45.000000000 +0200
++++ b/src/log_mysql.c  2017-10-04 12:42:27.961678871 +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_ARGON2I) == 0) {
+         crypto_argon2i++;
      } 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
+
+--- a/src/log_pgsql.c~ 2017-04-24 16:32:45.000000000 +0200
++++ b/src/log_pgsql.c  2017-10-04 12:42:57.562469704 +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_ARGON2I) == 0) {
+         crypto_argon2i++;
      } else if (strcasecmp(crypto, PASSWD_SQL_SCRYPT) == 0) {
-         crypto_scrypt++;
-     } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) {