tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2004/03/09 22:11:05 

[ssh.c]
     increase x11 cookie lifetime to 20 minutes; ok djm
This commit is contained in:
Damien Miller 2004-03-22 09:34:26 +11:00
parent bfba354261
commit 3df755e441
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,5 +1,9 @@
20040315 20040322
- (djm) [sshd.c] Drop supplemental groups if started as root - (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 20040311
- (djm) [configure.ac] Add standard license to configure.ac; ok ben, dtucker - (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) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

4
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -777,7 +777,7 @@ x11_get_proto(char **_proto, char **_data)
xauthdir); xauthdir);
snprintf(cmd, sizeof(cmd), snprintf(cmd, sizeof(cmd),
"%s -f %s generate %s " SSH_X11_PROTO "%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); options.xauth_location, xauthfile, display);
debug2("x11_get_proto: %s", cmd); debug2("x11_get_proto: %s", cmd);
if (system(cmd) == 0) if (system(cmd) == 0)