diff options
| author | Damien Miller <djm@mindrot.org> | 1999-10-30 11:39:56 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 1999-10-30 11:39:56 +1000 |
| commit | 1e4772c32c109e6c69291335ad49350e7762785d (patch) | |
| tree | 1a9224ff01d028a4b9f12a477ccf447624fca96f /ssh-agent.c | |
| parent | 5ffa64478a963426a1ab92a7b74b87d3ae79ba53 (diff) | |
Merged latest OpenBSD changes:
nchan.ms -\
channels.[ch] - remove broken x11 fix and document istate/ostate
ssh-agent.c - call setsid() regardless of argv[]
ssh.c - save a few lines when disabling rhosts-{rsa-}auth
Diffstat (limited to 'ssh-agent.c')
| -rw-r--r-- | ssh-agent.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index a9d2a142..4f7f57f0 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.15 1999/10/28 08:43:10 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.16 1999/10/28 20:41:23 markus Exp $ */ /* @@ -15,9 +15,8 @@ The authentication agent program. */ -#include "config.h" #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.15 1999/10/28 08:43:10 markus Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.16 1999/10/28 20:41:23 markus Exp $"); #include "ssh.h" #include "rsa.h" @@ -656,11 +655,17 @@ main(int ac, char **av) close(1); close(2); - if (ac == 0 && setsid() == -1) - cleanup_exit(1); + if (setsid() == -1) + { + perror("setsid"); + cleanup_exit(1); + } if (atexit(cleanup_socket) < 0) - cleanup_exit(1); + { + perror("atexit"); + cleanup_exit(1); + } new_socket(AUTH_SOCKET, sock); if (ac > 0) |