diff options
| author | Damien Miller <djm@mindrot.org> | 2004-03-22 09:34:26 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-03-22 09:34:26 +1100 |
| commit | 3df755e441bbc5b0084389fbb5e4c90509ac609b (patch) | |
| tree | 322f99706b7f8325a6229ae76a7f0d2b2719eeb4 | |
| parent | bfba3542614fb900384f957c908a34d125e81d78 (diff) | |
- markus@cvs.openbsd.org 2004/03/09 22:11:05
[ssh.c]
increase x11 cookie lifetime to 20 minutes; ok djm
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ssh.c | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -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 $ @@ -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 <openssl/evp.h> #include <openssl/err.h> @@ -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) |