From 6eff5d51dbbf7a2ff3a1be3f375b960b5db68d4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 30 Jun 2010 10:08:19 +0000 Subject: [PATCH] - all auth that tries all auth methods including plaintext Changed files: pure-ftpd-allauth.patch -> 1.1 pure-ftpd.spec -> 1.194 --- pure-ftpd-allauth.patch | 47 +++++++++++++++++++++++++++++++++++++++++ pure-ftpd.spec | 4 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 pure-ftpd-allauth.patch diff --git a/pure-ftpd-allauth.patch b/pure-ftpd-allauth.patch new file mode 100644 index 0000000..ccae86b --- /dev/null +++ b/pure-ftpd-allauth.patch @@ -0,0 +1,47 @@ +--- pure-ftpd-1.0.29/src/log_mysql.h~ 2010-03-15 16:20:25.000000000 +0100 ++++ pure-ftpd-1.0.29/src/log_mysql.h 2010-06-30 11:57:43.084176772 +0200 +@@ -6,6 +6,7 @@ + #define PASSWD_SQL_MYSQL "password" + #define PASSWD_SQL_MD5 "md5" + #define PASSWD_SQL_ANY "any" ++#define PASSWD_SQL_ALL "all" + #define MYSQL_DEFAULT_SERVER "localhost" + #define MYSQL_DEFAULT_PORT 3306 + #define MYSQL_MAX_REQUEST_LENGTH ((size_t) 8192U) +--- pure-ftpd-1.0.29/src/log_mysql.c~ 2010-03-15 16:20:25.000000000 +0100 ++++ pure-ftpd-1.0.29/src/log_mysql.c 2010-06-30 11:58:39.120827157 +0200 +@@ -416,6 +416,11 @@ + crypto_crypt++; + crypto_mysql++; + crypto_md5++; ++ } else if (strcasecmp(crypto, PASSWD_SQL_ALL) == 0) { ++ crypto_crypt++; ++ crypto_mysql++; ++ crypto_md5++; ++ crypto_plain++; + } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) { + crypto_crypt++; + } else if (strcasecmp(crypto, PASSWD_SQL_MYSQL) == 0) { +--- pure-ftpd-1.0.29/src/log_pgsql.h~ 2010-03-15 16:20:25.000000000 +0100 ++++ pure-ftpd-1.0.29/src/log_pgsql.h 2010-06-30 11:57:59.065414391 +0200 +@@ -6,6 +6,7 @@ + #define PASSWD_SQL_PGSQL "password" + #define PASSWD_SQL_MD5 "md5" + #define PASSWD_SQL_ANY "any" ++#define PASSWD_SQL_ALL "all" + #define PGSQL_DEFAULT_SERVER "localhost" + #define PGSQL_DEFAULT_PORT 5432 + #define PGSQL_MAX_REQUEST_LENGTH ((size_t) 8192U) +--- pure-ftpd-1.0.29/src/log_pgsql.c~ 2010-03-15 16:20:25.000000000 +0100 ++++ pure-ftpd-1.0.29/src/log_pgsql.c 2010-06-30 11:59:01.591116941 +0200 +@@ -494,6 +494,10 @@ + if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) { + crypto_crypt++; + crypto_md5++; ++ } else if (strcasecmp(crypto, PASSWD_SQL_ANY) == 0) { ++ crypto_crypt++; ++ crypto_md5++; ++ crypto_plain++; + } else if (strcasecmp(crypto, PASSWD_SQL_CRYPT) == 0) { + crypto_crypt++; + } else if (strcasecmp(crypto, PASSWD_SQL_MD5) == 0) { diff --git a/pure-ftpd.spec b/pure-ftpd.spec index 9033933..40c3c50 100644 --- a/pure-ftpd.spec +++ b/pure-ftpd.spec @@ -9,7 +9,7 @@ %bcond_without tls # disable SSL/TLS support %bcond_without cap # disable capabilities # -%define rel 2 +%define rel 3 Summary: Small, fast and secure FTP server Summary(pl.UTF-8): Mały, szybki i bezpieczny serwer FTP Name: pure-ftpd @@ -31,6 +31,7 @@ Patch0: %{name}-config.patch Patch1: %{name}-path_to_ssl_cert_in_config.patch Patch2: %{name}-pure-pw_passwd.patch Patch3: %{name}-mysql_config.patch +Patch4: %{name}-allauth.patch Patch5: %{name}-passwd_location.patch Patch6: %{name}-additionalgid.patch Patch7: audit_cap.patch @@ -94,6 +95,7 @@ Ten pakiet zawiera schemat Pure-FTPd pureftpd.schema dla openldapa. %setup -q -a 5 %patch0 -p0 %patch3 -p1 +%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 -- 2.44.0