- vsfptd.log as a default log file has to be rotated (#167359)

- vsftpd does dns reverse before passing hosts to pam_access.so (#159745)

vsftpd-1.1.3-rh.patch

@@ -36,11 +36,3 @@
 +#enable for standalone mode
 +listen=YES
 +tcp_wrappers=YES
---- vsftpd-1.2.1/RedHat/vsftpd.log.rh	2004-05-19 17:17:21.000000000 -0400
-+++ vsftpd-1.2.1/RedHat/vsftpd.log	2004-05-19 17:17:27.000000000 -0400
-@@ -1,4 +1,4 @@
--/var/log/vsftpd.log {
-+/var/log/xferlog {
-     # ftpd doesn't handle SIGHUP properly
-     nocompress
-     missingok

vsftpd-2.0.3-pam_hostname.patch

@@ -0,0 +1,37 @@
+--- vsftpd-2.0.3/sysdeputil.c.old	2004-09-14 03:18:54.000000000 +0200
++++ vsftpd-2.0.3/sysdeputil.c	2005-09-09 12:09:10.000000000 +0200
+@@ -16,6 +17,9 @@
+ #include "tunables.h"
+ #include "builddefs.h"
+ 
++/* For gethostbyaddr, inet_addr */
++#include <netdb.h>
++
+ /* For Linux, this adds nothing :-) */
+ #include "port/porting_junk.h"
+ 
+@@ -284,6 +288,10 @@
+                       const struct mystr* p_remote_host)
+ {
+   int retval;
++#ifdef PAM_RHOST
++  struct sockaddr_in sin;
++  struct hostent *host;
++#endif
+   struct pam_conv the_conv =
+   {
+     &pam_conv_func,
+@@ -302,7 +310,12 @@
+     return 0;
+   }
+ #ifdef PAM_RHOST
+-  retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host));
++  sin.sin_addr.s_addr = inet_addr(str_getbuf(p_remote_host));
++  host = gethostbyaddr((char*)&sin.sin_addr.s_addr,sizeof(struct in_addr),AF_INET);
++  if (host != (struct hostent*)0)
++    retval = pam_set_item(s_pamh, PAM_RHOST, host->h_name);
++  else
++    retval = pam_set_item(s_pamh, PAM_RHOST, str_getbuf(p_remote_host));
+   if (retval != PAM_SUCCESS)
+   {
+     (void) pam_end(s_pamh, 0);

vsftpd.spec

@@ -3,7 +3,7 @@
 Summary: vsftpd - Very Secure Ftp Daemon
 Name: vsftpd
 Version: 2.0.3
-Release: 9
+Release: 10
 License: GPL
 Group: System Environment/Daemons
 URL: http://vsftpd.beasts.org/
@@ -30,6 +30,7 @@ Patch13: vsftpd-2.0.3-background.patch
 Patch14: vsftpd-2.0.3-daemonize_fds.patch
 Patch15: vsftpd-2.0.1-kickline.patch
 Patch16: vsfptd-2.0.3-user_config.patch
+Patch17: vsftpd-2.0.3-pam_hostname.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 %if %{tcp_wrappers}
@@ -74,6 +75,7 @@ cp %{SOURCE1} .
 %patch14 -p1 -b .fds
 %patch15 -p1 -b .kickline
 %patch16 -p1 -b .user_config
+%patch17 -p1 -b .old
 
 %build
 %ifarch s390x
@@ -132,6 +134,10 @@ fi
 /var/ftp
 
 %changelog
+* Fri Sep 09 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-10
+- vsfptd.log as a default log file has to be rotated (#167359)
+- vsftpd does dns reverse before passing hosts to pam_access.so (#159745)
+
 * Wed Aug 31 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-9
 - don't die when no user config file is present (#166986)