- update for pre9

Changed files:
    proftpd-DESTDIR.patch -> 1.3
    proftpd-betterlog.patch -> 1.3

diff --git a/proftpd-DESTDIR.patch b/proftpd-DESTDIR.patch
index bfb13d784185c4362296a75fdef81cf8c6fe035c..d1c8fee7b51364b3ecda7a3244d4dd8a2a63e555 100644 (file)
--- a/proftpd-DESTDIR.patch
+++ b/proftpd-DESTDIR.patch
@@ -1,7 +1,7 @@
-diff -urN proftpd-1.2.0pre8.orig/Makefile.in proftpd-1.2.0pre8/Makefile.in
---- proftpd-1.2.0pre8.orig/Makefile.in Wed Oct  6 15:59:56 1999
-+++ proftpd-1.2.0pre8/Makefile.in      Wed Oct  6 16:03:05 1999
-@@ -69,38 +69,38 @@
+diff -ur proftpd-1.2.0pre9.orig/Makefile.in proftpd-1.2.0pre9/Makefile.in
+--- proftpd-1.2.0pre9.orig/Makefile.in Thu Oct 28 15:10:13 1999
++++ proftpd-1.2.0pre9/Makefile.in      Thu Oct 28 15:22:09 1999
+@@ -73,38 +73,38 @@
        rm -f proftpd ftpcount ftpwho ftpshut core *~
  
  # BSD install -d doesn't work, so ...
@@ -27,11 +27,11 @@ diff -urN proftpd-1.2.0pre8.orig/Makefile.in proftpd-1.2.0pre8/Makefile.in
  
 -install-utils: $(sbindir) $(bindir)
 -      $(INSTALL_BIN) ftpcount $(bindir)/ftpcount
--      (cd $(bindir) ; rm -f ftpwho ; ln -s ftpcount ftpwho)
+-      $(INSTALL_BIN) ftpwho $(bindir)/ftpwho
 -      $(INSTALL_SBIN) ftpshut $(sbindir)/ftpshut
 +install-utils: $(DESTDIR)$(sbindir) $(DESTDIR)$(bindir)
 +      $(INSTALL_BIN) ftpcount $(DESTDIR)$(bindir)/ftpcount
-+      (cd $(DESTDIR)$(bindir) ; rm -f ftpwho ; ln -s ftpcount ftpwho)
++      $(INSTALL_BIN) ftpwho $(DESTDIR)$(bindir)/ftpwho
 +      $(INSTALL_SBIN) ftpshut $(DESTDIR)$(sbindir)/ftpshut
  
 -install-conf: $(sysconfdir)

diff --git a/proftpd-betterlog.patch b/proftpd-betterlog.patch
index 466e04474e7456b18a7558c22b4145f63003f32a..7b43a8d65e868883ddaeb86dd6b94d3de1c9a967 100644 (file)
--- a/proftpd-betterlog.patch
+++ b/proftpd-betterlog.patch
@@ -1,29 +1,30 @@
-diff -ur proftpd-1.2.0pre4.orig/modules/mod_auth.c proftpd-1.2.0pre4/modules/mod_auth.c
---- proftpd-1.2.0pre4.orig/modules/mod_auth.c  Mon Aug 30 05:43:57 1999
-+++ proftpd-1.2.0pre4/modules/mod_auth.c       Wed Sep  1 13:59:36 1999
-@@ -525,7 +525,11 @@
+diff -ur proftpd-1.2.0pre9.orig/modules/mod_auth.c proftpd-1.2.0pre9/modules/mod_auth.c
+--- proftpd-1.2.0pre9.orig/modules/mod_auth.c  Sat Oct 23 07:18:49 1999
++++ proftpd-1.2.0pre9/modules/mod_auth.c       Thu Oct 28 15:18:57 1999
+@@ -541,8 +541,11 @@
    c = _auth_resolve_user(p,&user,&ourname,&anonname);
  
    if(!user) {
--    log_pri(LOG_NOTICE,"failed login from %s, '%s' is not a UserAlias.",inet_ascii(p,session.c->remote_ipaddr),origuser);
+-    log_pri(LOG_NOTICE, "USER %s (Login failed): User not a UserAlias.",
+-          origuser);
 +    log_auth(LOG_NOTICE,"USER %s: user is not a UserAlias 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);
++              origuser,session.c->remote_name,
++              inet_ascii(p,session.c->remote_ipaddr),
++              inet_ascii(p,session.c->local_ipaddr),
++              session.c->local_port);
      goto auth_failure;
    }
  
-@@ -533,7 +537,11 @@
+@@ -550,7 +553,11 @@
    aclp = login_check_limits(main_server->conf,FALSE,TRUE,&i);
  
    if((pw = auth_getpwnam(p,user)) == NULL) {
--    log_pri(LOG_NOTICE,"failed login from %s, can't find user '%s'",inet_ascii(p,session.c->remote_ipaddr),user);
+-    log_pri(LOG_NOTICE, "USER %s (Login failed): Can't find user.", user);
 +    log_auth(LOG_NOTICE,"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);
++              user,session.c->remote_name,
++              inet_ascii(p,session.c->remote_ipaddr),
++              inet_ascii(p,session.c->local_ipaddr),
++              session.c->local_port);
      goto auth_failure;
    }