corrected time zone handling; especially DST flag,
fixed default value of option 'listen'
This commit is contained in:
Jiri Skala
parent
88e239f25f
commit
6666d8a776
@ -5,7 +5,7 @@
|
||||
# listens on IPv4 sockets. This directive cannot be used in conjunction
|
||||
# with the listen_ipv6 directive.
|
||||
-listen=YES
|
||||
+#listen=YES
|
||||
+listen=NO
|
||||
#
|
||||
-# This directive enables listening on IPv6 sockets. To listen on IPv4 and IPv6
|
||||
-# sockets, you must run two copies of vsftpd with two configuration files.
|
||||
|
||||
146
vsftpd-3.0.0-tz.patch
Normal file
146
vsftpd-3.0.0-tz.patch
Normal file
@ -0,0 +1,146 @@
|
||||
diff -up vsftpd-2.2.2/sysutil.c.tz vsftpd-2.2.2/sysutil.c
|
||||
--- vsftpd-2.2.2/sysutil.c.tz 2012-04-26 12:45:21.095145878 +0200
|
||||
+++ vsftpd-2.2.2/sysutil.c 2012-04-26 12:48:08.729618686 +0200
|
||||
@@ -26,8 +26,10 @@
|
||||
/* For Linux, this adds nothing :-) */
|
||||
#include "port/porting_junk.h"
|
||||
|
||||
+#define F_LOCALTIME "/etc/localtime"
|
||||
+#define BUFTZSIZ 64
|
||||
+
|
||||
#include <signal.h>
|
||||
-#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/types.h>
|
||||
@@ -55,6 +57,11 @@
|
||||
#include <utime.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/resource.h>
|
||||
+
|
||||
+#ifndef __USE_GNU
|
||||
+ #define __USE_GNU
|
||||
+#endif
|
||||
+#include <string.h>
|
||||
|
||||
/* Private variables to this file */
|
||||
/* Current umask() */
|
||||
@@ -2558,49 +2565,92 @@ error:
|
||||
die("reopening standard file descriptors to /dev/null failed");
|
||||
}
|
||||
|
||||
+char* vsf_sysutil_get_tz()
|
||||
+{
|
||||
+ char *ret_tz = NULL;
|
||||
+ char buff[BUFTZSIZ];
|
||||
+ off_t s_pos, e_pos;
|
||||
+ size_t rcnt, rest;
|
||||
+ int fd;
|
||||
+
|
||||
+ if ((fd = open(F_LOCALTIME, O_RDONLY)) > -1)
|
||||
+ {
|
||||
+ if ((e_pos = lseek(fd, 0, SEEK_END)) <= 0)
|
||||
+ {
|
||||
+ close(fd);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+ s_pos = e_pos > BUFTZSIZ ? e_pos - BUFTZSIZ : 0;
|
||||
+ lseek(fd, s_pos, SEEK_SET);
|
||||
+ rcnt = read(fd, buff, BUFTZSIZ);
|
||||
+
|
||||
+ if (rcnt && buff[rcnt-1] == '\n')
|
||||
+ {
|
||||
+ buff[rcnt-1] = 0;
|
||||
+ e_pos--;
|
||||
+ }
|
||||
+
|
||||
+ do {
|
||||
+ char *nl = memrchr(buff, '\n', rcnt);
|
||||
+ if (rcnt && nl)
|
||||
+ {
|
||||
+ int offset = (++nl) - buff;
|
||||
+ int len = e_pos - s_pos - offset;
|
||||
+ if (len)
|
||||
+ {
|
||||
+ lseek(fd, s_pos + offset, SEEK_SET);
|
||||
+ ret_tz = calloc(1, len+4);
|
||||
+ memcpy(ret_tz, "TZ=", 3);
|
||||
+ rcnt = read(fd, ret_tz+3, len);
|
||||
+ }
|
||||
+ break;
|
||||
+ }
|
||||
+ if (!s_pos)
|
||||
+ {
|
||||
+ break;
|
||||
+ }
|
||||
+ rest = s_pos > BUFTZSIZ ? s_pos - BUFTZSIZ : 0;
|
||||
+ s_pos -= rest;
|
||||
+ lseek(fd, s_pos, SEEK_SET);
|
||||
+ rcnt = read(fd, buff, rest);
|
||||
+ } while (rcnt > 0);
|
||||
+
|
||||
+ close (fd);
|
||||
+ }
|
||||
+
|
||||
+ return ret_tz;
|
||||
+}
|
||||
+
|
||||
void
|
||||
vsf_sysutil_tzset(void)
|
||||
{
|
||||
int retval;
|
||||
- char tzbuf[sizeof("+HHMM!")];
|
||||
+ char *tz=NULL, tzbuf[sizeof("+HHMM!")];
|
||||
time_t the_time = time(NULL);
|
||||
struct tm* p_tm;
|
||||
+
|
||||
+ /* Set our timezone in the TZ environment variable to cater for the fact
|
||||
+ * that modern glibc does not cache /etc/localtime (which becomes inaccessible
|
||||
+ * when we chroot().
|
||||
+ */
|
||||
+ tz = vsf_sysutil_get_tz();;
|
||||
+ if (tz)
|
||||
+ {
|
||||
+ putenv(tz);
|
||||
+ }
|
||||
tzset();
|
||||
p_tm = localtime(&the_time);
|
||||
if (p_tm == NULL)
|
||||
{
|
||||
die("localtime");
|
||||
}
|
||||
- /* Set our timezone in the TZ environment variable to cater for the fact
|
||||
- * that modern glibc does not cache /etc/localtime (which becomes inaccessible
|
||||
- * when we chroot().
|
||||
- */
|
||||
retval = strftime(tzbuf, sizeof(tzbuf), "%z", p_tm);
|
||||
tzbuf[sizeof(tzbuf) - 1] = '\0';
|
||||
if (retval == 5)
|
||||
{
|
||||
- /* Static because putenv() does not copy the string. */
|
||||
- static char envtz[sizeof("TZ=UTC-hh:mm")];
|
||||
- /* Insert a colon so we have e.g. -05:00 instead of -0500 */
|
||||
- tzbuf[5] = tzbuf[4];
|
||||
- tzbuf[4] = tzbuf[3];
|
||||
- tzbuf[3] = ':';
|
||||
- /* Invert the sign - we just got the offset _from_ UTC but for TZ, we need
|
||||
- * the offset _to_ UTC.
|
||||
- */
|
||||
- if (tzbuf[0] == '+')
|
||||
- {
|
||||
- tzbuf[0] = '-';
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- tzbuf[0] = '+';
|
||||
- }
|
||||
- snprintf(envtz, sizeof(envtz), "TZ=UTC%s", tzbuf);
|
||||
- putenv(envtz);
|
||||
s_timezone = ((tzbuf[1] - '0') * 10 + (tzbuf[2] - '0')) * 60 * 60;
|
||||
- s_timezone += ((tzbuf[4] - '0') * 10 + (tzbuf[5] - '0')) * 60;
|
||||
- if (tzbuf[0] == '-')
|
||||
+ s_timezone += ((tzbuf[3] - '0') * 10 + (tzbuf[4] - '0')) * 60;
|
||||
+ if (tzbuf[0] == '+')
|
||||
{
|
||||
s_timezone *= -1;
|
||||
}
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: vsftpd
|
||||
Version: 3.0.0
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
Summary: Very Secure Ftp Daemon
|
||||
|
||||
Group: System Environment/Daemons
|
||||
@ -54,6 +54,7 @@ Patch19: vsftpd-2.3.4-sd.patch
|
||||
Patch20: vsftpd-2.3.4-sqb.patch
|
||||
Patch21: vsftpd-2.3.4-listen_ipv6.patch
|
||||
Patch22: vsftpd-2.3.5-aslim.patch
|
||||
Patch23: vsftpd-3.0.0-tz.patch
|
||||
|
||||
%description
|
||||
vsftpd is a Very Secure FTP daemon. It was written completely from
|
||||
@ -91,6 +92,7 @@ cp %{SOURCE1} .
|
||||
%patch20 -p1 -b .sqb
|
||||
%patch21 -p1 -b .listen_ipv6
|
||||
%patch22 -p1 -b .aslim
|
||||
%patch23 -p1 -b .tz
|
||||
|
||||
%build
|
||||
%ifarch s390x sparcv9 sparc64
|
||||
@ -165,6 +167,10 @@ fi
|
||||
%{_sysconfdir}/rc.d/init.d/vsftpd
|
||||
|
||||
%changelog
|
||||
* Thu Apr 26 2012 Jiri Skala <jskala@redhat.com> - 3.0.0-2
|
||||
- corrected time zone handling - especially DST flag
|
||||
- fixed default value of option 'listen'
|
||||
|
||||
* Tue Apr 10 2012 Jiri Skala <jskala@redhat.com> - 3.0.0-1
|
||||
- updated to latest upstream 3.0.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user