Attachment 2312 Details for Bug 2106 – call tzset() for sftp-server and before chroot in sshd

[patch] call tzset() for sftp-server and before chroot in sshd

bz2106.diff (text/plain), 1.23 KB, created by Damien Miller on 2013-07-12 10:56:09 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2013-07-12 10:56:09 AEST

Size: 1.23 KB

patch

obsolete

>Index: session.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/session.c,v
>retrieving revision 1.265
>diff -u -p -r1.265 session.c
>--- session.c	17 May 2013 00:13:14 -0000	1.265
>+++ session.c	12 Jul 2013 00:52:58 -0000
>@@ -51,6 +51,7 @@
> #include <stdio.h>
> #include <stdlib.h>
> #include <string.h>
>+#include <time.h>
> #include <unistd.h>
> 
> #include "xmalloc.h"
>@@ -1173,7 +1174,7 @@ safely_chroot(const char *path, uid_t ui
> 			    cp == NULL ? "" : "component ", component);
> 
> 	}
>-
>+	tzset();
> 	if (chdir(path) == -1)
> 		fatal("Unable to chdir to chroot path \"%s\": "
> 		    "%s", path, strerror(errno));
>Index: sftp-server-main.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sftp-server-main.c,v
>retrieving revision 1.4
>diff -u -p -r1.4 sftp-server-main.c
>--- sftp-server-main.c	21 Feb 2009 19:32:04 -0000	1.4
>+++ sftp-server-main.c	12 Jul 2013 00:52:58 -0000
>@@ -19,6 +19,7 @@
> #include <pwd.h>
> #include <stdarg.h>
> #include <stdio.h>
>+#include <time.h>
> #include <unistd.h>
> 
> #include "log.h"
>@@ -44,6 +45,6 @@ main(int argc, char **argv)
> 		    (u_long)getuid());
> 		return 1;
> 	}
>-
>+	tzset();
> 	return (sftp_server_main(argc, argv, user_pw));
> }

Actions: View | Diff

Attachments on bug 2106: 2312