rpms/vsftpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- daemonize with file descriptors (#164998)

Browse Source
This commit is contained in:
Radek Vokál 2005-08-04 09:09:49 +00:00
parent 922807db67
commit 0a533210fe
2 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
vsftpd-2.0.3-daemonize_fds.patch Normal file
View File

@ -0,0 +1,70 @@
diff -u vsftpd-2.0.1.orig/standalone.c vsftpd-2.0.1/standalone.c
--- vsftpd-2.0.1.orig/standalone.c 2005-06-15 16:08:52.000000000 -0400
+++ vsftpd-2.0.1/standalone.c 2005-06-15 16:06:26.000000000 -0400
@@ -53,6 +53,7 @@
vsf_sysutil_exit(0);
}
vsf_sysutil_make_session_leader();
+ vsf_sysutil_reopen_standard_fds();
}
if (tunable_listen)
{
diff -u vsftpd-2.0.1.orig/sysutil.c vsftpd-2.0.1/sysutil.c
--- vsftpd-2.0.1.orig/sysutil.c 2005-06-15 16:08:52.000000000 -0400
+++ vsftpd-2.0.1/sysutil.c 2005-06-15 16:03:25.000000000 -0400
@@ -2357,6 +2357,44 @@
}
void
+vsf_sysutil_reopen_standard_fds(void)
+{
+ /* This reopens STDIN, STDOUT and STDERR to /dev/null */
+
+ int fd;
+
+ if ( (fd = open("/dev/null", O_RDWR, 0)) == -1 )
+ {
+ goto error;
+ }
+
+ if ( dup2(fd, STDIN_FILENO) == -1 )
+ {
+ goto error;
+ }
+
+ if ( dup2(fd, STDOUT_FILENO) == -1 )
+ {
+ goto error;
+ }
+
+ if ( dup2(fd, STDERR_FILENO) == -1 )
+ {
+ goto error;
+ }
+
+ if ( fd > 2 )
+ {
+ (void) close(fd);
+ }
+
+ return;
+
+error:
+ die("reopening standard file descriptors to /dev/null failed");
+}
+
+void
vsf_sysutil_tzset(void)
{
tzset();
diff -u vsftpd-2.0.1.orig/sysutil.h vsftpd-2.0.1/sysutil.h
--- vsftpd-2.0.1.orig/sysutil.h 2004-06-04 06:11:52.000000000 -0400
+++ vsftpd-2.0.1/sysutil.h 2005-06-15 16:03:54.000000000 -0400
@@ -287,6 +287,7 @@
unsigned int vsf_sysutil_get_umask(void);
void vsf_sysutil_set_umask(unsigned int umask);
void vsf_sysutil_make_session_leader(void);
+void vsf_sysutil_reopen_standard_fds(void);
void vsf_sysutil_tzset(void);
const char* vsf_sysutil_get_current_date(void);
void vsf_sysutil_qsort(void* p_base, unsigned int num_elem,

7
vsftpd.spec
View File

@ -3,7 +3,7 @@
Summary: vsftpd - Very Secure Ftp Daemon
Name: vsftpd
Version: 2.0.3
Release: 6
Release: 7
License: GPL
Group: System Environment/Daemons
URL: http://vsftpd.beasts.org/
@ -27,6 +27,7 @@ Patch10: vsftpd-2.0.1-use_localtime.patch
Patch11: vsftpd-1.2.1-nonrootconf.patch
Patch12: vsftpd-2.0.1-tzfix.diff
Patch13: vsftpd-2.0.3-background.patch
Patch14: vsftpd-2.0.3-daemonize_fds.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%if %{tcp_wrappers}
BuildPrereq: tcp_wrappers
@ -67,6 +68,7 @@ cp %{SOURCE1} .
%patch11 -p1 -b .nonrootconf
%patch12 -p1 -b .tzfix
%patch13 -p1 -b .background
%patch14 -p1 -b .fds
%build
%ifarch s390x
@ -125,6 +127,9 @@ fi
/var/ftp
%changelog
* Thu Aug 04 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-7
- daemonize with file descriptors (#164998)
* Thu Jun 30 2005 Radek Vokal <rvokal@redhat.com> 2.0.3-6
- start in background as default, init script changed (#158714)