Attachment 156436 Details for Bug 243087 – Patch to add a "log_localtime" option to vsftpd

Patch to add a "log_localtime" option to vsftpd

vsftpd-2.0.5-loglocaltime.patch (text/x-patch), 3.82 KB, created by Ted Rule on 2007-06-07 09:15:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ted Rule

Created: 2007-06-07 09:15:26 UTC

Size: 3.82 KB

patch

obsolete

>diff -uNr vsftpd-2.0.5-orig/logging.c vsftpd-2.0.5/logging.c
>--- vsftpd-2.0.5-orig/logging.c	2007-06-07 09:08:54.000000000 +0100
>+++ vsftpd-2.0.5/logging.c	2007-06-07 09:20:16.000000000 +0100
>@@ -171,7 +171,8 @@
>   long delta_sec;
>   enum EVSFLogEntryType what = (enum EVSFLogEntryType) p_sess->log_type;
>   /* Date - vsf_sysutil_get_current_date updates cached time */
>-  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime));
>+  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime ||
>+						tunable_log_localtime));
>   str_append_char(p_str, ' ');
>   /* Transfer time (in seconds) */
>   delta_sec = vsf_sysutil_get_cached_time_sec() - p_sess->log_start_sec;
>@@ -241,7 +242,8 @@
>                              const struct mystr* p_log_str)
> {
>   /* Date - vsf_sysutil_get_current_date updates cached time */
>-  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime));
>+  str_alloc_text(p_str, vsf_sysutil_get_current_date(tunable_use_localtime ||
>+						tunable_log_localtime));
>   /* Pid */
>   str_append_text(p_str, " [pid ");
>   str_append_ulong(p_str, vsf_sysutil_getpid());
>diff -uNr vsftpd-2.0.5-orig/parseconf.c vsftpd-2.0.5/parseconf.c
>--- vsftpd-2.0.5-orig/parseconf.c	2007-06-07 09:08:55.000000000 +0100
>+++ vsftpd-2.0.5/parseconf.c	2007-06-07 09:20:16.000000000 +0100
>@@ -66,6 +66,7 @@
>   { "userlist_enable", &tunable_userlist_enable },
>   { "userlist_deny", &tunable_userlist_deny },
>   { "use_localtime", &tunable_use_localtime },
>+  { "log_localtime", &tunable_log_localtime },
>   { "check_shell", &tunable_check_shell },
>   { "hide_ids", &tunable_hide_ids },
>   { "listen", &tunable_listen },
>diff -uNr vsftpd-2.0.5-orig/tunables.c vsftpd-2.0.5/tunables.c
>--- vsftpd-2.0.5-orig/tunables.c	2007-06-07 09:08:54.000000000 +0100
>+++ vsftpd-2.0.5/tunables.c	2007-06-07 09:20:16.000000000 +0100
>@@ -37,6 +37,7 @@
> int tunable_userlist_enable = 0;
> int tunable_userlist_deny = 1;
> int tunable_use_localtime = 0;
>+int tunable_log_localtime = 0;
> int tunable_check_shell = 1;
> int tunable_hide_ids = 0;
> int tunable_listen = 0;
>diff -uNr vsftpd-2.0.5-orig/tunables.h vsftpd-2.0.5/tunables.h
>--- vsftpd-2.0.5-orig/tunables.h	2006-07-02 00:07:00.000000000 +0100
>+++ vsftpd-2.0.5/tunables.h	2007-06-07 09:20:16.000000000 +0100
>@@ -33,6 +33,7 @@
> extern int tunable_userlist_enable;           /* Explicit user allow or deny */
> extern int tunable_userlist_deny;             /* Is user list allow or deny? */
> extern int tunable_use_localtime;             /* Use local time or GMT? */
>+extern int tunable_log_localtime;             /* Use local time or GMT for logs only */
> extern int tunable_check_shell;               /* Use /etc/shells for non-PAM */
> extern int tunable_hide_ids;                  /* Show "ftp" in ls listings */
> extern int tunable_listen;                    /* Standalone (no inetd) mode? */
>diff -uNr vsftpd-2.0.5-orig/vsftpd.conf.5 vsftpd-2.0.5/vsftpd.conf.5
>--- vsftpd-2.0.5-orig/vsftpd.conf.5	2007-06-07 09:08:54.000000000 +0100
>+++ vsftpd-2.0.5/vsftpd.conf.5	2007-06-07 09:28:43.000000000 +0100
>@@ -290,6 +290,18 @@
> 
> Default: NO
> .TP
>+.B log_localtime
>+If enabled, vsftpd will generate log messages with the time in your
>+local time zone. The default is to display GMT. Note that the use_localtime
>+option also affects log timestamps; if EITHER of the log_localtime OR
>+use_localtime options are enabled, the log timestamps will be in the
>+local time zone. This option is useful for compatibility with syslog, where
>+timestamps are usually in the local time zone, whilst still allowing
>+MDTM and LS to report in GMT via use_localtime=no, as per RFC3659.
>+For backwards-compatibility, this option is disabled by default.
>+
>+Default: NO
>+.TP
> .B ls_recurse_enable
> When enabled, this setting will allow the use of "ls -R". This is a minor
> security risk, because a ls -R at the top level of a large site may consume

Actions: View

Attachments on bug 243087: 156436