182 lines
6.2 KiB
Plaintext
182 lines
6.2 KiB
Plaintext
--- modules/mod_auth.c.orig Fri Oct 22 22:18:49 1999
|
|
+++ modules/mod_auth.c Sun Dec 5 11:22:46 1999
|
|
@@ -70,7 +70,7 @@
|
|
"closing control connection.",
|
|
TimeoutLogin);
|
|
|
|
- main_exit((void*) LOG_NOTICE, "FTP login timed out, disconnected.",
|
|
+ main_exit((void*) LOG_INFO, "FTP login timed out, disconnected.",
|
|
(void*) 0, NULL);
|
|
|
|
/* should never be reached */
|
|
@@ -541,7 +541,7 @@
|
|
c = _auth_resolve_user(p,&user,&ourname,&anonname);
|
|
|
|
if(!user) {
|
|
- log_pri(LOG_NOTICE, "USER %s (Login failed): User not a UserAlias.",
|
|
+ log_pri(LOG_INFO, "USER %s (Login failed): User not a UserAlias.",
|
|
origuser);
|
|
goto auth_failure;
|
|
}
|
|
@@ -550,7 +550,7 @@
|
|
aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
|
|
|
|
if((pw = auth_getpwnam(p,user)) == NULL) {
|
|
- log_pri(LOG_NOTICE, "USER %s (Login failed): Can't find user.", user);
|
|
+ log_pri(LOG_INFO, "USER %s (Login failed): Can't find user.", user);
|
|
goto auth_failure;
|
|
}
|
|
|
|
@@ -607,14 +607,14 @@
|
|
}
|
|
|
|
if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){
|
|
- log_auth(LOG_NOTICE, "ANON %s (Login failed): Limit access denies "
|
|
+ log_auth(LOG_INFO, "ANON %s (Login failed): Limit access denies "
|
|
"login.", origuser);
|
|
goto auth_failure;
|
|
}
|
|
}
|
|
|
|
if(!c && !aclp) {
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): Limit access denies login.",
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): Limit access denies login.",
|
|
origuser);
|
|
goto auth_failure;
|
|
}
|
|
@@ -628,7 +628,7 @@
|
|
/* if 'AuthUsingAlias' set and logging in under an alias then auth using that alias */
|
|
if (origuser && strcasecmp(user,origuser) && get_param_int(c->subset,"AuthUsingAlias",FALSE) == 1) {
|
|
user_name = origuser;
|
|
- log_auth(LOG_NOTICE,"ANON AUTH: User %s, Auth Alias %s",user,user_name);
|
|
+ log_auth(LOG_INFO,"ANON AUTH: User %s, Auth Alias %s",user,user_name);
|
|
}
|
|
|
|
if(c)
|
|
@@ -655,22 +655,22 @@
|
|
|
|
switch(authcode) {
|
|
case AUTH_NOPWD:
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): No such user found.",
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): No such user found.",
|
|
user);
|
|
goto auth_failure;
|
|
|
|
case AUTH_BADPWD:
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): Incorrect password.",
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): Incorrect password.",
|
|
origuser);
|
|
goto auth_failure;
|
|
|
|
case AUTH_AGEPWD:
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): Password expired.",
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): Password expired.",
|
|
user);
|
|
goto auth_failure;
|
|
|
|
case AUTH_DISABLEDPWD:
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): Account disabled.",
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): Account disabled.",
|
|
user);
|
|
goto auth_failure;
|
|
|
|
@@ -693,12 +693,12 @@
|
|
auth_setgrent(p);
|
|
|
|
if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) {
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): Invalid shell.", user);
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): Invalid shell.", user);
|
|
goto auth_failure;
|
|
}
|
|
|
|
if(!_auth_check_ftpusers((c ? c->subset : main_server->conf),pw->pw_name)) {
|
|
- log_auth(LOG_NOTICE, "USER %s (Login failed): User in %s.", FTPUSERS_PATH);
|
|
+ log_auth(LOG_INFO, "USER %s (Login failed): User in %s.", FTPUSERS_PATH);
|
|
goto auth_failure;
|
|
}
|
|
|
|
@@ -769,7 +769,7 @@
|
|
|
|
if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i))
|
|
{
|
|
- log_auth(LOG_NOTICE, "%s: Limit access denies login (DenyGroup).",
|
|
+ log_auth(LOG_INFO, "%s: Limit access denies login (DenyGroup).",
|
|
origuser);
|
|
goto auth_failure;
|
|
}
|
|
@@ -784,9 +784,9 @@
|
|
resolve_anonymous_dirs(c->subset);
|
|
|
|
if(c)
|
|
- log_auth(LOG_NOTICE, "ANON %s: Login successful.", origuser);
|
|
+ log_auth(LOG_INFO, "ANON %s: Login successful.", origuser);
|
|
else
|
|
- log_auth(LOG_NOTICE,"USER %s: Login successful.", origuser);
|
|
+ log_auth(LOG_INFO,"USER %s: Login successful.", origuser);
|
|
|
|
/* Write the login to wtmp. This must be done here because we won't
|
|
* have access after we give up root. This can result in falsified
|
|
@@ -1050,7 +1050,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);
|
|
@@ -1067,7 +1067,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);
|
|
@@ -1075,7 +1075,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.");
|
|
end_login(0);
|
|
}
|
|
@@ -1146,7 +1146,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);
|
|
@@ -1179,7 +1179,7 @@
|
|
send_response(R_530,"%s",
|
|
sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
|
|
|
|
- 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);
|
|
@@ -1203,7 +1203,7 @@
|
|
if(cur >= max) {
|
|
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);
|
|
end_login(0);
|
|
}
|
|
|
|
@@ -1283,7 +1283,7 @@
|
|
|
|
if(++auth_tries >= max) {
|
|
send_response(R_530,"Login incorrect");
|
|
- log_auth(LOG_NOTICE, "Maximum login attempts exceeded.");
|
|
+ log_auth(LOG_INFO, "Maximum login attempts exceeded.");
|
|
end_login(0);
|
|
}
|
|
|