Date: Sun, 28 Mar 1999 00:55:02 -0800 From: mharo@area51.fremont.ca.us To: FreeBSD-gnats-submit@freebsd.org Subject: ports/10830: Update: net/proftpd Message-ID: <199903280855.AAA23078@patrol.area51.fremont.ca.us>
next in thread | raw e-mail | index | archive | help
>Number: 10830 >Category: ports >Synopsis: Update: net/proftpd >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Mar 28 01:00:00 PST 1999 >Closed-Date: >Last-Modified: >Originator: Michael Haro >Release: FreeBSD 3.1-STABLE i386 >Organization: >Environment: >Description: Proftpd Pre-Release 3 is now out. portlint passes fine. one updated patch file. no new or removed patch files. >How-To-Repeat: >Fix: cvs diff: in directory .: cvs diff: ignoring CVS/Root because it specifies a non-existent repository /hos t/trang.nuxi.com/FBSD/CVS-repository Index: Makefile =================================================================== RCS file: /cvs/ports/net/proftpd/Makefile,v retrieving revision 1.8 diff -u -r1.8 Makefile - --- Makefile 1999/03/15 02:13:32 1.8 +++ Makefile 1999/03/28 07:57:51 @@ -6,7 +6,7 @@ # $Id: Makefile,v 1.8 1999/03/15 02:13:32 steve Exp $ # - -DISTNAME= proftpd-1.2.0pre2 +DISTNAME= proftpd-1.2.0pre3 PKGNAME= proftpd-1.2.0 CATEGORIES= net MASTER_SITES= ftp://ftp.proftpd.org/distrib/ Index: files/md5 =================================================================== RCS file: /cvs/ports/net/proftpd/files/md5,v retrieving revision 1.5 diff -u -r1.5 md5 - --- md5 1999/03/15 02:13:35 1.5 +++ md5 1999/03/28 07:57:51 @@ -1 +1 @@ - -MD5 (proftpd-1.2.0pre2.tar.gz) = 85bed6f9211ba4a33f560312f1090a4b +MD5 (proftpd-1.2.0pre3.tar.gz) = 60b8dc1ffd656a0c6823e83dc07aaecb Index: patches/patch-ae =================================================================== RCS file: /cvs/ports/net/proftpd/patches/patch-ae,v retrieving revision 1.3 diff -u -r1.3 patch-ae - --- patch-ae 1998/12/14 22:13:37 1.3 +++ patch-ae 1999/03/28 07:57:52 @@ -1,15 +1,107 @@ - ---- 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 @@ +--- modules/mod_auth.c.orig Thu Mar 4 16:29:19 1999 ++++ modules/mod_auth.c Sat Mar 27 23:50:44 1999 +@@ -65,11 +65,11 @@ /* Is this the proper behavior when timing out? */ send_response_async(R_421,"Login Timeout (%d seconds): closing control conn ection.", TimeoutLogin); +- main_exit((void*)LOG_NOTICE,"FTP login timed out, disconnected.", ++ main_exit((void*)LOG_INFO,"FTP login timed out, disconnected.", + (void*)0,NULL); + + /* - 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 @@ +@@ -525,7 +525,7 @@ + c = _auth_resolve_user(p,&user,&ourname,&anonname); + + if(!user) { +- log_pri(LOG_NOTICE,"failed login, '%s' is not a UserAlias.",origuser); ++ log_pri(LOG_INFO,"failed login, '%s' is not a UserAlias.",origuser); + goto auth_failure; + } + +@@ -533,7 +533,7 @@ + aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i); + + if((pw = auth_getpwnam(p,user)) == NULL) { +- log_pri(LOG_NOTICE,"failed login, can't find user '%s'",user); ++ log_pri(LOG_INFO,"failed login, can't find user '%s'",user); + goto auth_failure; + } + +@@ -596,7 +596,7 @@ + } + + if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ){ +- log_auth(LOG_NOTICE,"ANON %s: LIMIT access denies login from %s [%s] to %s:%i", ++ log_auth(LOG_INFO,"ANON %s: LIMIT access denies login from %s [%s] to % s:%i", + origuser, + session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), +@@ -607,7 +607,7 @@ + } + + if(!c && !aclp) { +- log_auth(LOG_NOTICE,"USER %s: LIMIT access denies login from %s [%s] to % s:%i", ++ log_auth(LOG_INFO,"USER %s: LIMIT access denies login 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), +@@ -642,28 +642,28 @@ + + switch(authcode) { + case AUTH_NOPWD: +- log_auth(LOG_NOTICE,"USER %s: no such user found from %s [%s] to %s:%i" , ++ log_auth(LOG_INFO,"USER %s: no such user found from %s [%s] to %s:%i", + user,session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), + inet_ascii(p,session.c->local_ipaddr), + session.c->local_port); + break; + case AUTH_BADPWD: +- log_auth(LOG_NOTICE,"USER %s: incorrect password from %s [%s] to %s:%i" , ++ log_auth(LOG_INFO,"USER %s: incorrect password 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); + break; + case AUTH_AGEPWD: +- log_auth(LOG_NOTICE,"USER %s: password expired from %s [%s] to %s:%i", ++ log_auth(LOG_INFO,"USER %s: password expired from %s [%s] to %s:%i", + user,session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), + inet_ascii(p,session.c->local_ipaddr), + session.c->local_port); + break; + case AUTH_DISABLEDPWD: +- log_auth(LOG_NOTICE,"USER %s: account disabled from %s [%s] to %s:%i", ++ log_auth(LOG_INFO,"USER %s: account disabled from %s [%s] to %s:%i", + user,session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), + inet_ascii(p,session.c->local_ipaddr), +@@ -685,7 +685,7 @@ + auth_setgrent(p); + + if(!_auth_check_shell((c ? c->subset : main_server->conf),pw->pw_shell)) { +- log_auth(LOG_NOTICE,"failed login '%s' from %s [%s] to %s:%i (invalid she ll)", ++ log_auth(LOG_INFO,"failed login '%s' from %s [%s] to %s:%i (invalid shell )", + user,session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), + inet_ascii(p,session.c->local_ipaddr), +@@ -694,7 +694,7 @@ + } + + if(!_auth_check_ftpusers((c ? c->subset : main_server->conf),pw->pw_name)) { +- log_auth(LOG_NOTICE,"failed login '%s' from %s [%s] to %s:%i (user in %s) ", ++ log_auth(LOG_INFO,"failed login '%s' from %s [%s] to %s:%i (user in %s)", + pw->pw_name,session.c->remote_name, + inet_ascii(p,session.c->remote_ipaddr), + inet_ascii(p,session.c->local_ipaddr), +@@ -787,13 +787,13 @@ resolve_anonymous_dirs(c->subset); if(c) @@ -25,7 +117,34 @@ origuser,session.c->remote_name, inet_ascii(p,session.c->remote_ipaddr), inet_ascii(p,session.c->local_ipaddr), - -@@ -1132,7 +1132,7 @@ +@@ -1063,7 +1063,7 @@ + + if(failnopwprompt) { + if(!user) { +- log_pri(LOG_NOTICE,"failed login, '%s' is not a UserAlias.",origuser); ++ log_pri(LOG_INFO,"failed login, '%s' is not a UserAlias.",origuser); + send_response(R_530,"Login incorrect."); + end_login(0); + } +@@ -1079,7 +1079,7 @@ + + if(c) { + if(!login_check_limits(c->subset,FALSE,TRUE,&i) || (!aclp && !i) ) { +- log_auth(LOG_NOTICE,"ANON %s: LIMIT access denies login from %s [%s] to %s:%i", ++ log_auth(LOG_INFO,"ANON %s: LIMIT access denies login from %s [ %s] to %s:%i", + origuser, + session.c->remote_name, + inet_ascii(cmd->tmp_pool,session.c->remote_ipaddr), +@@ -1091,7 +1091,7 @@ + } + + if(!c && !aclp) { +- log_auth(LOG_NOTICE,"USER %s: LIMIT access denies login from %s [%s] to %s:%i", ++ log_auth(LOG_INFO,"USER %s: LIMIT access denies login from %s [%s] to % s:%i", + origuser,session.c->remote_name, + inet_ascii(cmd->tmp_pool,session.c->remote_ipaddr), + inet_ascii(cmd->tmp_pool,session.c->local_ipaddr), +@@ -1156,7 +1156,7 @@ send_response(R_530,"%s", sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL)); @@ -34,7 +153,7 @@ max); end_login(0); } - -@@ -1156,7 +1156,7 @@ +@@ -1180,7 +1180,7 @@ send_response(R_530,"%s", sreplace(cmd->tmp_pool,maxstr,"%m",maxn,NULL)); @@ -43,7 +162,7 @@ max); end_login(0); } - -@@ -1243,7 +1243,7 @@ +@@ -1267,7 +1267,7 @@ if(++auth_tries >= max) { send_response(R_530,"Login incorrect"); - --AAA23028.922611057/patrol.area51.fremont.ca.us-- ------- End of Forwarded Message >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199903280855.AAA23078>