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 @@ | |||
1 | 20040315 | 1 | 20040322 |
2 | - (djm) [sshd.c] Drop supplemental groups if started as root | 2 | - (djm) [sshd.c] Drop supplemental groups if started as root |
3 | - (djm) OpenBSD CVS Sync | ||
4 | - markus@cvs.openbsd.org 2004/03/09 22:11:05 | ||
5 | [ssh.c] | ||
6 | increase x11 cookie lifetime to 20 minutes; ok djm | ||
3 | 7 | ||
4 | 20040311 | 8 | 20040311 |
5 | - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker | 9 | - (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker |
@@ -901,4 +905,4 @@ | |||
901 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 905 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
902 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 906 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
903 | 907 | ||
904 | $Id: ChangeLog,v 1.3289 2004/03/21 22:29:57 djm Exp $ | 908 | $Id: ChangeLog,v 1.3290 2004/03/21 22:34:26 djm Exp $ |
@@ -40,7 +40,7 @@ | |||
40 | */ | 40 | */ |
41 | 41 | ||
42 | #include "includes.h" | 42 | #include "includes.h" |
43 | RCSID("$OpenBSD: ssh.c,v 1.206 2003/12/16 15:49:51 markus Exp $"); | 43 | RCSID("$OpenBSD: ssh.c,v 1.207 2004/03/09 22:11:05 markus Exp $"); |
44 | 44 | ||
45 | #include <openssl/evp.h> | 45 | #include <openssl/evp.h> |
46 | #include <openssl/err.h> | 46 | #include <openssl/err.h> |
@@ -777,7 +777,7 @@ x11_get_proto(char **_proto, char **_data) | |||
777 | xauthdir); | 777 | xauthdir); |
778 | snprintf(cmd, sizeof(cmd), | 778 | snprintf(cmd, sizeof(cmd), |
779 | "%s -f %s generate %s " SSH_X11_PROTO | 779 | "%s -f %s generate %s " SSH_X11_PROTO |
780 | " untrusted timeout 120 2>" _PATH_DEVNULL, | 780 | " untrusted timeout 1200 2>" _PATH_DEVNULL, |
781 | options.xauth_location, xauthfile, display); | 781 | options.xauth_location, xauthfile, display); |
782 | debug2("x11_get_proto: %s", cmd); | 782 | debug2("x11_get_proto: %s", cmd); |
783 | if (system(cmd) == 0) | 783 | if (system(cmd) == 0) |