head	1.10;
access;
symbols
	old_RELEASE_4_2_0:1.7
	old_RELEASE_4_1_1:1.7
	old_RELEASE_4_1_0:1.6
	old_RELEASE_3_5_0:1.6
	old_RELEASE_4_0_0:1.6
	old_RELEASE_3_4_0:1.5
	old_RELEASE_3_3_0:1.4
	old_RELEASE_3_2_0:1.4
	old_RELEASE_3_1_0:1.3
	old_RELEASE_2_2_8:1.2
	old_RELEASE_3_0_0:1.2
	old_RELEASE_2_2_7:1.2
	old_RELEASE_2_2_6:1.1;
locks; strict;
comment	@# @;


1.10
date	2001.03.29.19.56.45;	author mharo;	state dead;
branches;
next	1.9;

1.9
date	2001.03.07.00.32.00;	author mharo;	state Exp;
branches;
next	1.8;

1.8
date	2001.02.11.21.26.53;	author mharo;	state Exp;
branches;
next	1.7;

1.7
date	2000.07.28.18.01.04;	author mharo;	state Exp;
branches;
next	1.6;

1.6
date	2000.01.28.07.35.15;	author mharo;	state Exp;
branches;
next	1.5;

1.5
date	99.12.05.19.29.53;	author mharo;	state Exp;
branches;
next	1.4;

1.4
date	99.04.02.03.35.05;	author steve;	state Exp;
branches;
next	1.3;

1.3
date	98.12.14.22.13.37;	author billf;	state Exp;
branches;
next	1.2;

1.2
date	98.06.14.15.56.50;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	98.02.20.08.55.56;	author obrien;	state Exp;
branches;
next	;


desc
@@


1.10
log
@update to 1.2.2rc1 - this version fixes the DOS bug in 1.2.1
@
text
@--- modules/mod_auth.c.old	Sun Mar  4 15:14:21 2001
+++ modules/mod_auth.c	Sun Mar  4 15:15:29 2001
@@@@ -92,7 +92,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 */
@@@@ -518,7 +518,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;
   }
@@@@ -527,7 +527,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;
   }
 
@@@@ -595,14 +595,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;
   }
@@@@ -619,7 +619,7 @@@@
     if(c && 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",
+      log_auth(LOG_INFO, "ANON AUTH: User %s, Auth Alias %s",
 	       user, user_name);
     }
     
@@@@ -647,22 +647,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;
 
@@@@ -685,12 +685,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.",
+    log_auth(LOG_INFO, "USER %s (Login failed): User in %s.",
 	     user, FTPUSERS_PATH);
     goto auth_failure;
   }
@@@@ -819,7 +819,7 @@@@
 
   if(!login_check_limits((c ? c->subset : main_server->conf),FALSE,TRUE,&i))
   {
-    log_auth(LOG_NOTICE, "%s %s: Limit access denies login.",
+    log_auth(LOG_INFO, "%s %s: Limit access denies login.",
 	     (c != NULL) ? "ANON" : "USER", origuser);
     goto auth_failure;
   }
@@@@ -834,7 +834,7 @@@@
   if(c && c->subset)
     resolve_anonymous_dirs(c->subset);
 
-  log_auth(LOG_NOTICE, "%s %s: Login successful.",
+  log_auth(LOG_INFO, "%s %s: Login successful.",
 	   (c != NULL) ? "ANON" : "USER",
 	   origuser);
 
@@@@ -1229,7 +1229,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);
@@@@ -1261,7 +1261,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);
@@@@ -1286,7 +1286,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);
@@@@ -1316,7 +1316,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);
@@@@ -1363,7 +1363,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.");
 
@@@@ -1384,7 +1384,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.");
 
@@@@ -1396,7 +1396,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);
@@@@ -1490,7 +1490,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);
     }
 
@


1.9
log
@Update to 1.2.1

* Update master sites
* Use bzip2 distfiles instead of gzip
* Add WITHOUT_PAM support.
* Add the quota and wrap (TCP Wrappers support) modules.

Submitted by:	Anders Nordby <anders@@fix.no>
@
text
@@


1.8
log
@update to 1.2.0rc3

Submitted by:	Anders Nordby <anders@@fix.no>
@
text
@d1 3
a3 3
--- 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 @@@@
d12 1
a12 1
@@@@ -630,7 +630,7 @@@@
d21 1
a21 1
@@@@ -639,7 +639,7 @@@@
d30 1
a30 1
@@@@ -700,14 +700,14 @@@@
d47 1
a47 1
@@@@ -724,7 +724,7 @@@@
d56 1
a56 1
@@@@ -752,22 +752,22 @@@@
d83 1
a83 1
@@@@ -790,12 +790,12 @@@@
d98 1
a98 1
@@@@ -870,7 +870,7 @@@@
d102 3
a104 3
-    log_auth(LOG_NOTICE, "%s: Limit access denies login (DenyGroup).",
+    log_auth(LOG_INFO, "%s: Limit access denies login (DenyGroup).",
 	     origuser);
d107 1
a107 1
@@@@ -885,7 +885,7 @@@@
d116 1
a116 1
@@@@ -1267,7 +1267,7 @@@@
d125 1
a125 1
@@@@ -1299,7 +1299,7 @@@@
d134 1
a134 1
@@@@ -1324,7 +1324,7 @@@@
d143 1
a143 1
@@@@ -1354,7 +1354,7 @@@@
d152 1
a152 1
@@@@ -1401,7 +1401,7 @@@@
d161 1
a161 1
@@@@ -1422,7 +1422,7 @@@@
d170 1
a170 1
@@@@ -1434,7 +1434,7 @@@@
d179 1
a179 1
@@@@ -1528,7 +1528,7 @@@@
@


1.7
log
@Update to proftpd 1.2.0rc2
@
text
@d1 3
a3 3
--- 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 @@@@
d12 1
a12 1
@@@@ -608,7 +608,7 @@@@
d21 1
a21 1
@@@@ -617,7 +617,7 @@@@
d30 1
a30 1
@@@@ -678,14 +678,14 @@@@
d47 1
a47 1
@@@@ -702,7 +702,7 @@@@
d56 1
a56 1
@@@@ -730,22 +730,22 @@@@
d83 1
a83 1
@@@@ -768,12 +768,12 @@@@
d98 1
a98 1
@@@@ -845,7 +845,7 @@@@
d107 1
a107 1
@@@@ -860,7 +860,7 @@@@
d116 39
a154 1
@@@@ -1172,7 +1172,7 @@@@
a155 2
   if(failnopwprompt) {
     if(!user) {
a159 2
       end_login(0);
@@@@ -1189,7 +1189,7 @@@@
d161 4
a164 2
     if(c) {
       if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) {
d168 6
a173 6
 	send_response(R_530,"Login incorrect.");
 	end_login(0);
@@@@ -1197,7 +1197,7 @@@@
     }
     
     if(!c && !aclp) {
d176 1
a176 19
       send_response(R_530,"Login incorrect.");
       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));
 
-      log_auth(LOG_NOTICE, "Connection refused (max clients per host %d).",
+      log_auth(LOG_INFO, "Connection refused (max clients per host %d).",
 	       max);
d179 1
a179 10
@@@@ -1330,7 +1330,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);
     }
 
@@@@ -1411,7 +1411,7 @@@@
@


1.6
log
@Update to pre10
@
text
@d1 3
a3 3
--- modules/mod_auth.c.orig	Mon Jan  3 13:28:39 2000
+++ modules/mod_auth.c	Thu Jan 27 23:17:19 2000
@@@@ -70,7 +70,7 @@@@
d12 1
a12 1
@@@@ -559,7 +559,7 @@@@
d21 1
a21 1
@@@@ -568,7 +568,7 @@@@
d30 1
a30 1
@@@@ -629,14 +629,14 @@@@
d47 3
a49 3
@@@@ -650,7 +650,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) {
d51 3
a53 2
-      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);
d55 2
a56 3
 
     if(c)
@@@@ -677,22 +677,22 @@@@
d83 1
a83 1
@@@@ -715,12 +715,12 @@@@
d98 1
a98 1
@@@@ -792,7 +792,7 @@@@
d107 2
a108 1
@@@@ -807,9 +807,9 @@@@
d111 6
a116 10
   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
@@@@ -1073,7 +1073,7 @@@@
d125 1
a125 1
@@@@ -1090,7 +1090,7 @@@@
d134 1
a134 1
@@@@ -1098,7 +1098,7 @@@@
d143 1
a143 1
@@@@ -1169,7 +1169,7 @@@@
d152 1
a152 1
@@@@ -1202,7 +1202,7 @@@@
d161 1
a161 1
@@@@ -1226,7 +1226,7 @@@@
d170 1
a170 1
@@@@ -1301,7 +1301,7 @@@@
@


1.5
log
@update to 1.2.0p9
@
text
@d1 2
a2 2
--- modules/mod_auth.c.orig	Fri Oct 22 22:18:49 1999
+++ modules/mod_auth.c	Sun Dec  5 11:22:46 1999
d12 1
a12 1
@@@@ -541,7 +541,7 @@@@
d21 1
a21 1
@@@@ -550,7 +550,7 @@@@
d30 1
a30 1
@@@@ -607,14 +607,14 @@@@
d47 1
a47 1
@@@@ -628,7 +628,7 @@@@
d56 1
a56 1
@@@@ -655,22 +655,22 @@@@
d83 1
a83 1
@@@@ -693,12 +693,12 @@@@
d93 3
a95 2
-    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);
d98 1
a98 2
 
@@@@ -769,7 +769,7 @@@@
d107 1
a107 1
@@@@ -784,9 +784,9 @@@@
d119 1
a119 1
@@@@ -1050,7 +1050,7 @@@@
d128 1
a128 1
@@@@ -1067,7 +1067,7 @@@@
d137 1
a137 1
@@@@ -1075,7 +1075,7 @@@@
d146 1
a146 1
@@@@ -1146,7 +1146,7 @@@@
d155 1
a155 1
@@@@ -1179,7 +1179,7 @@@@
d164 1
a164 1
@@@@ -1203,7 +1203,7 @@@@
d173 1
a173 1
@@@@ -1283,7 +1283,7 @@@@
@


1.4
log
@Update to version 1.2.0pre3.

PR:		10830
Submitted by:	Micahel Haro <mharo@@area51.fremont.ca.us>
@
text
@d1 4
a4 5
--- modules/mod_auth.c.orig	Thu Mar  4 18:29:19 1999
+++ modules/mod_auth.c	Thu Apr  1 14:36:03 1999
@@@@ -65,7 +65,7 @@@@
   /* Is this the proper behavior when timing out? */
   send_response_async(R_421,"Login Timeout (%d seconds): closing control connection.",
d6 8
a13 3
-  main_exit((void*)LOG_NOTICE,"FTP login timed out, disconnected.",
+  main_exit((void*)LOG_INFO,"FTP login timed out, disconnected.",
 		  (void*)0,NULL);
d15 93
a107 2
 /*
@@@@ -787,13 +787,13 @@@@
d111 2
a112 6
-    log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s] to %s:%i",
+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s] to %s:%i",
       origuser,session.c->remote_name,
       inet_ascii(p,session.c->remote_ipaddr),
       inet_ascii(p,session.c->local_ipaddr),
       session.c->local_port);
d114 6
a119 8
-    log_auth(LOG_NOTICE,"FTP login as '%s' from %s [%s] to %s:%i",
+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s] to %s:%i",
       origuser,session.c->remote_name,
       inet_ascii(p,session.c->remote_ipaddr),
       inet_ascii(p,session.c->local_ipaddr),
@@@@ -1156,7 +1156,7 @@@@
       send_response(R_530,"%s",
                     sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL));
d121 6
a126 3
-      log_auth(LOG_NOTICE,"connection refused (max clients per host %d)",
+      log_auth(LOG_INFO,"connection refused (max clients per host %d)",
                max);
d128 10
d139 17
a155 1
@@@@ -1180,7 +1180,7 @@@@
d159 11
a169 3
-      log_auth(LOG_NOTICE,"connection refused (max clients %d)",
+      log_auth(LOG_INFO,"connection refused (max clients %d)",
                max);
d172 2
a173 1
@@@@ -1267,7 +1267,7 @@@@
d177 5
a181 5
-      log_auth(LOG_NOTICE,"Maximum login attempts exceeded from %s [%s] to %s:%i",
+      log_auth(LOG_INFO,"Maximum login attempts exceeded from %s [%s] to %s:%i",
                session.c->remote_name,
                inet_ascii(cmd->tmp_pool,session.c->remote_ipaddr),
 	       inet_ascii(cmd->tmp_pool,session.c->local_ipaddr),
@


1.3
log
@Upgrade to 1.2.0, and associated changes.
@
text
@d1 3
a3 3
--- modules/mod_auth.c.orig	Sat Oct 17 22:24:41 1998
+++ modules/mod_auth.c	Mon Dec 14 15:26:02 1998
@@@@ -61,7 +61,7 @@@@
d7 6
a12 6
-  schedule(main_exit,0,(void*)LOG_NOTICE,"FTP login timed out, disconnected.",
+  schedule(main_exit,0,(void*)LOG_INFO,"FTP login timed out, disconnected.",
            (void*)0,NULL);
   remove_timer(TIMER_IDLE,ANY_MODULE);
   remove_timer(TIMER_NOXFER,ANY_MODULE);
@@@@ -763,13 +763,13 @@@@
d28 1
a28 1
@@@@ -1132,7 +1132,7 @@@@
d37 1
a37 1
@@@@ -1156,7 +1156,7 @@@@
d46 1
a46 1
@@@@ -1243,7 +1243,7 @@@@
@


1.2
log
@Upgrade to version 1.0.3pl1.

PR:		6884
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- modules//mod_auth.c.orig	Sun Jun  7 16:17:57 1998
+++ modules/mod_auth.c	Sun Jun  7 16:21:29 1998
@@@@ -177,7 +177,7 @@@@
d12 2
a13 2
@@@@ -763,10 +763,10 @@@@
   }
d16 6
a21 3
-    log_auth(LOG_NOTICE,"ANONYMOUS FTP login as '%s' from %s [%s]",
+    log_auth(LOG_INFO,"ANONYMOUS FTP login as '%s' from %s [%s]",
     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
d23 8
a30 3
-    log_auth(LOG_NOTICE,"FTP login as '%s' from %s [%s]",
+    log_auth(LOG_INFO,"FTP login as '%s' from %s [%s]",
     origuser,session.c->remote_name,inet_ntoa(*session.c->remote_ipaddr));
d32 6
a37 2
   session.user = pstrdup(permanent_pool,auth_map_uid(pw->pw_uid));
@@@@ -987,7 +987,7 @@@@
d46 9
@


1.1
log
@Make this thing syslog(3) like the stock ftpd(8).
We now use facility FTP vs. DAEMON, and many LOG_NOTICEs were down graded
to LOG_INFO.  Out of the box, this thing will fill your `messages' file
so full, you'd never see anything else in it again, on a busy ftp server.
@
text
@d1 2
a2 2
--- modules/mod_auth.c.orig	Tue Nov 11 09:17:23 1997
+++ modules/mod_auth.c	Fri Feb 20 00:38:05 1998
d12 1
a12 1
@@@@ -731,10 +731,10 @@@@
d25 1
a25 1
@@@@ -955,7 +955,7 @@@@
@
