From ce321d8a30a81222d11a4c27fd353804a9afecd3 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 3 Oct 2005 18:11:24 +1000 Subject: - djm@cvs.openbsd.org 2005/09/13 23:40:07 [sshd.c ssh.c misc.h sftp.c ssh-keygen.c ssh-keysign.c sftp-server.c scp.c misc.c ssh-keyscan.c ssh-add.c ssh-agent.c] ensure that stdio fds are attached; ok deraadt@ --- ssh-add.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'ssh-add.c') diff --git a/ssh-add.c b/ssh-add.c index a3428769c..749a76829 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-add.c,v 1.72 2005/07/17 07:17:55 djm Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.73 2005/09/13 23:40:07 djm Exp $"); #include @@ -312,6 +312,9 @@ main(int argc, char **argv) char *sc_reader_id = NULL; int i, ch, deleting = 0, ret = 0; + /* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */ + sanitise_stdfd(); + __progname = ssh_get_progname(argv[0]); init_rng(); seed_rng(); -- cgit v1.2.3 From b736d8d8292cd2222e6ad37518d562026d87f1dd Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Tue, 22 Nov 2005 19:37:08 +1100 Subject: - deraadt@cvs.openbsd.org 2005/11/12 18:37:59 [ssh-add.c] space --- ChangeLog | 8 +++++++- ssh-add.c | 5 +++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'ssh-add.c') diff --git a/ChangeLog b/ChangeLog index 68c99482b..fb7cdbdfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20051122 + - (dtucker) OpenBSD CVS Sync + - deraadt@cvs.openbsd.org 2005/11/12 18:37:59 + [ssh-add.c] + space + 20051120 - (dtucker) [openbsd-compat/openssl-compat.h] Add comment explaining what is going on. @@ -3306,4 +3312,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.3996 2005/11/20 03:09:59 dtucker Exp $ +$Id: ChangeLog,v 1.3997 2005/11/22 08:37:08 dtucker Exp $ diff --git a/ssh-add.c b/ssh-add.c index 749a76829..2b01e6f13 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-add.c,v 1.73 2005/09/13 23:40:07 djm Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.74 2005/11/12 18:37:59 deraadt Exp $"); #include @@ -324,7 +324,8 @@ main(int argc, char **argv) /* At first, get a connection to the authentication agent. */ ac = ssh_get_authentication_connection(); if (ac == NULL) { - fprintf(stderr, "Could not open a connection to your authentication agent.\n"); + fprintf(stderr, + "Could not open a connection to your authentication agent.\n"); exit(2); } while ((ch = getopt(argc, argv, "lLcdDxXe:s:t:")) != -1) { -- cgit v1.2.3