diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2000-11-21 21:24:55 +0000 |
| commit | 14920293713ff4a5bbe45b495694bfd925d73894 (patch) | |
| tree | d0f63720bdcbc574dc3c018beeb28e6da4b5e1fb /session.c | |
| parent | 4a1d91646d4248c111f573e496cc0d10ba62e274 (diff) | |
20001123
- (bal) Merge OpenBSD changes:
- markus@cvs.openbsd.org 2000/11/15 22:31:36
[auth-options.c]
case insensitive key options; from stevesk@sweeden.hp.com
- markus@cvs.openbsd.org 2000/11/16 17:55:43
[dh.c]
do not use perror() in sshd, after child is forked()
- markus@cvs.openbsd.org 2000/11/14 23:42:40
[auth-rsa.c]
parse option only if key matches; fix some confusing seen by the client
- markus@cvs.openbsd.org 2000/11/14 23:44:19
[session.c]
check no_agent_forward_flag for ssh-2, too
- markus@cvs.openbsd.org 2000/11/15
[ssh-agent.1]
reorder SYNOPSIS; typo, use .It
- markus@cvs.openbsd.org 2000/11/14 23:48:55
[ssh-agent.c]
do not reorder keys if a key is removed
- markus@cvs.openbsd.org 2000/11/15 19:58:08
[ssh.c]
just ignore non existing user keys
- millert@cvs.openbsd.org 200/11/15 20:24:43
[ssh-keygen.c]
Add missing \n at end of error message.
Diffstat (limited to 'session.c')
| -rw-r--r-- | session.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.43 2000/11/06 23:04:56 markus Exp $"); +RCSID("$OpenBSD: session.c,v 1.44 2000/11/14 23:44:19 markus Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -1745,6 +1745,10 @@ session_auth_agent_req(Session *s) { static int called = 0; packet_done(); + if (no_agent_forwarding_flag) { + debug("session_auth_agent_req: no_agent_forwarding_flag"); + return 0; + } if (called) { return 0; } else { |