summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2004-03-09 22:11:06 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2004-03-09 22:11:06 +0000
commit7bda23486716460200b0f91ef463e87d0591d442 (patch)
tree7d6f34bf02267e8f552a95cca4ee850da184323d /usr.bin
parent5edfac3543c7435a54864903c13ec06839e0f102 (diff)
increase x11 cookie lifetime to 20 minutes; ok djm
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 1af84d9baef..a74e33c1ec9 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/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 <openssl/evp.h>
#include <openssl/err.h>
@@ -762,7 +762,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)