Added EACCES to not die by vsf_sysutil_bind (#198677)

This commit is contained in:
Maros Barabas 2007-01-17 12:52:52 +00:00
parent 0fb8b6cecd
commit 662b3a6986
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,36 @@
--- vsftpd-2.0.5/postlogin.c.old 2007-01-17 12:22:10.000000000 +0100
+++ vsftpd-2.0.5/postlogin.c 2007-01-17 12:20:33.000000000 +0100
@@ -557,7 +557,8 @@
{
break;
}
- if (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE)
+ if ( (vsf_sysutil_get_error() == kVSFSysUtilErrADDRINUSE) ||
+ (vsf_sysutil_get_error() == kVSFSysUtilErrEACCES) )
{
continue;
}
--- vsftpd-2.0.5/sysutil.h.old 2007-01-17 12:22:10.000000000 +0100
+++ vsftpd-2.0.5/sysutil.h 2007-01-17 12:20:52.000000000 +0100
@@ -16,7 +16,8 @@
kVSFSysUtilErrNOSYS,
kVSFSysUtilErrINTR,
kVSFSysUtilErrINVAL,
- kVSFSysUtilErrOPNOTSUPP
+ kVSFSysUtilErrOPNOTSUPP,
+ kVSFSysUtilErrEACCES
};
enum EVSFSysUtilError vsf_sysutil_get_error(void);
--- vsftpd-2.0.5/sysutil.c.old 2007-01-17 12:22:10.000000000 +0100
+++ vsftpd-2.0.5/sysutil.c 2007-01-17 12:20:22.000000000 +0100
@@ -1553,6 +1553,9 @@
case EOPNOTSUPP:
retval = kVSFSysUtilErrOPNOTSUPP;
break;
+ case EACCES:
+ retval = kVSFSysUtilErrEACCES;
+ break;
}
return retval;
}

View File

@ -3,7 +3,7 @@
Summary: vsftpd - Very Secure Ftp Daemon
Name: vsftpd
Version: 2.0.5
Release: 10
Release: 11
License: GPL
Group: System Environment/Daemons
URL: http://vsftpd.beasts.org/
@ -38,6 +38,7 @@ Patch22: vsftpd-2.0.5-man.patch
Patch23: vsftpd-2.0.4-filter.patch
Patch24: vsftpd-2.0.5-file_stat.patch
Patch25: vsftpd-2.0.5-confspell.patch
Patch26: vsftpd-2.0.5-bind_denied.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if %{tcp_wrappers}
@ -90,6 +91,7 @@ cp %{SOURCE1} .
%patch23 -p1 -b .filter
%patch24 -p1 -b .file_stat
%patch25 -p1
%patch26 -p1 -b .bind_denied
%build
%ifarch s390x
@ -148,6 +150,10 @@ fi
/var/ftp
%changelog
* Wed Jan 17 2006 Maros Barabas <mbarabas@redhat.com> - 2.0.5-11
- add errno EACCES to not die by vsf_sysutil_bind
- Resolves #198677
* Thu Dec 14 2006 Maros Barabas <mbarabas@redhat.com> - 2.0.5-10
- correct man (5) pages
- Resolves: #216765