From 3df755e441bbc5b0084389fbb5e4c90509ac609b Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 22 Mar 2004 09:34:26 +1100 Subject: [PATCH] - markus@cvs.openbsd.org 2004/03/09 22:11:05 [ssh.c] increase x11 cookie lifetime to 20 minutes; ok djm --- ChangeLog | 8 ++++++-- ssh.c | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b44befe31..1c877f099 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ -20040315 +20040322 - (djm) [sshd.c] Drop supplemental groups if started as root + - (djm) OpenBSD CVS Sync + - markus@cvs.openbsd.org 2004/03/09 22:11:05 + [ssh.c] + increase x11 cookie lifetime to 20 minutes; ok djm 20040311 - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker @@ -901,4 +905,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3289 2004/03/21 22:29:57 djm Exp $ +$Id: ChangeLog,v 1.3290 2004/03/21 22:34:26 djm Exp $ diff --git a/ssh.c b/ssh.c index da390c12d..87d22aab2 100644 --- a/ssh.c +++ b/ssh.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.206 2003/12/16 15:49:51 markus Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.207 2004/03/09 22:11:05 markus Exp $"); #include #include @@ -777,7 +777,7 @@ x11_get_proto(char **_proto, char **_data) xauthdir); snprintf(cmd, sizeof(cmd), "%s -f %s generate %s " SSH_X11_PROTO - " untrusted timeout 120 2>" _PATH_DEVNULL, + " untrusted timeout 1200 2>" _PATH_DEVNULL, options.xauth_location, xauthfile, display); debug2("x11_get_proto: %s", cmd); if (system(cmd) == 0)