summaryrefslogtreecommitdiff
path: root/ftp/proftpd/files/patch-ae
diff options
context:
space:
mode:
Diffstat (limited to 'ftp/proftpd/files/patch-ae')
-rw-r--r--ftp/proftpd/files/patch-ae115
1 files changed, 62 insertions, 53 deletions
diff --git a/ftp/proftpd/files/patch-ae b/ftp/proftpd/files/patch-ae
index eb59e14d9b3f..50db35749dd1 100644
--- a/ftp/proftpd/files/patch-ae
+++ b/ftp/proftpd/files/patch-ae
@@ -1,6 +1,6 @@
---- modules/mod_auth.c.orig Fri Jul 28 10:51:59 2000
-+++ modules/mod_auth.c Fri Jul 28 10:52:17 2000
-@@ -72,7 +72,7 @@
+--- modules/mod_auth.c.old Sun Feb 11 19:42:37 2001
++++ modules/mod_auth.c Sun Feb 11 19:43:18 2001
+@@ -94,7 +94,7 @@
"closing control connection.",
TimeoutLogin);
@@ -9,7 +9,7 @@
(void*) 0, NULL);
/* should never be reached */
-@@ -608,7 +608,7 @@
+@@ -630,7 +630,7 @@
c = _auth_resolve_user(p,&user,&ourname,&anonname);
if(!user) {
@@ -18,7 +18,7 @@
origuser);
goto auth_failure;
}
-@@ -617,7 +617,7 @@
+@@ -639,7 +639,7 @@
aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
if((pw = auth_getpwnam(p,user)) == NULL) {
@@ -27,7 +27,7 @@
goto auth_failure;
}
-@@ -678,14 +678,14 @@
+@@ -700,14 +700,14 @@
}
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){
@@ -44,7 +44,7 @@
origuser);
goto auth_failure;
}
-@@ -702,7 +702,7 @@
+@@ -724,7 +724,7 @@
if(c && origuser && strcasecmp(user,origuser) &&
get_param_int(c->subset,"AuthUsingAlias",FALSE) == 1) {
user_name = origuser;
@@ -53,7 +53,7 @@
user, user_name);
}
-@@ -730,22 +730,22 @@
+@@ -752,22 +752,22 @@
switch(authcode) {
case AUTH_NOPWD:
@@ -80,7 +80,7 @@
user);
goto auth_failure;
-@@ -768,12 +768,12 @@
+@@ -790,12 +790,12 @@
auth_setgrent(p);
if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) {
@@ -95,7 +95,7 @@
user, FTPUSERS_PATH);
goto auth_failure;
}
-@@ -845,7 +845,7 @@
+@@ -870,7 +870,7 @@
if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i))
{
@@ -104,7 +104,7 @@
origuser);
goto auth_failure;
}
-@@ -860,7 +860,7 @@
+@@ -885,7 +885,7 @@
if(c && c->subset)
resolve_anonymous_dirs(c->subset);
@@ -113,61 +113,70 @@
(c != NULL) ? "ANON" : "USER",
origuser);
-@@ -1172,7 +1172,7 @@
-
- if(failnopwprompt) {
- if(!user) {
-- log_pri(LOG_NOTICE, "USER %s (Login failed): Not a UserAlias.",
-+ log_pri(LOG_INFO, "USER %s (Login failed): Not a UserAlias.",
- origuser);
- send_response(R_530,"Login incorrect.");
- end_login(0);
-@@ -1189,7 +1189,7 @@
-
- if(c) {
- if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) {
-- log_auth(LOG_NOTICE, "ANON %s: Limit access denies login.",
-+ log_auth(LOG_INFO, "ANON %s: Limit access denies login.",
- origuser);
- send_response(R_530,"Login incorrect.");
- end_login(0);
-@@ -1197,7 +1197,7 @@
- }
-
- if(!c && !aclp) {
-- log_auth(LOG_NOTICE, "USER %s: Limit access denies login.", origuser);
-+ log_auth(LOG_INFO, "USER %s: Limit access denies login.", origuser);
- send_response(R_530,"Login incorrect.");
+@@ -1267,7 +1267,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+
+- log_auth(LOG_NOTICE, "Connection refused (max clients for class %s).",
++ log_auth(LOG_INFO, "Connection refused (max clients for class %s).",
+ session.class->name);
+
end_login(0);
- }
-@@ -1269,7 +1269,7 @@
- "Too many users in your class, "
- "please try again later.");
-
-- log_auth(LOG_NOTICE, "Connection refused (max clients for class %s).",
-+ log_auth(LOG_INFO, "Connection refused (max clients for class %s).",
- session.class->name);
-
- end_login(0);
-@@ -1304,7 +1304,7 @@
- send_response(R_530,"%s",
- sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
+@@ -1299,7 +1299,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
- log_auth(LOG_NOTICE, "Connection refused (max clients per host %d).",
+ log_auth(LOG_INFO, "Connection refused (max clients per host %d).",
max);
end_login(0);
-@@ -1330,7 +1330,7 @@
- if(cur >= max) {
+@@ -1324,7 +1324,7 @@
send_response(R_530, "%s",
sreplace(cmd->tmp_pool, maxstr, "%m", maxn, NULL));
+
- log_auth(LOG_NOTICE, "Connection refused (max clients %d).", max);
+ log_auth(LOG_INFO, "Connection refused (max clients %d).", max);
+
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+@@ -1354,7 +1354,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+
+- log_auth(LOG_NOTICE, "Connection refused (max clients per host %d).",
++ log_auth(LOG_INFO, "Connection refused (max clients per host %d).",
+ max);
+
end_login(0);
- }
+@@ -1401,7 +1401,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+
+- log_pri(LOG_NOTICE, "USER %s (Login failed): Not a UserAlias.",
++ log_pri(LOG_INFO, "USER %s (Login failed): Not a UserAlias.",
+ origuser);
+ send_response(R_530,"Login incorrect.");
-@@ -1411,7 +1411,7 @@
+@@ -1422,7 +1422,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+
+- log_auth(LOG_NOTICE, "ANON %s: Limit access denies login.",
++ log_auth(LOG_INFO, "ANON %s: Limit access denies login.",
+ origuser);
+ send_response(R_530, "Login incorrect.");
+
+@@ -1434,7 +1434,7 @@
+ remove_config(cmd->server->conf, C_USER, FALSE);
+ remove_config(cmd->server->conf, C_PASS, FALSE);
+
+- log_auth(LOG_NOTICE, "USER %s: Limit access denies login.", origuser);
++ log_auth(LOG_INFO, "USER %s: Limit access denies login.", origuser);
+ send_response(R_530, "Login incorrect.");
+
+ end_login(0);
+@@ -1528,7 +1528,7 @@
if(++auth_tries >= max) {
send_response(R_530,"Login incorrect");
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-11 21:46:44 +0000