summaryrefslogtreecommitdiffstats
path: root/auth-rsa.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-01-20 22:44:08 +1100
committerDamien Miller <djm@mindrot.org>2000-01-20 22:44:08 +1100
commit396691ad5dd3bd264a79f6d137d3e0baccf4841c (patch)
treec200fbd5e1d7e4713c3906a3a287d5e2072a3cf8 /auth-rsa.c
parenteca71f84cb864571d677d5d1098d5c9698312607 (diff)
- Update to latest OpenBSD CVS:
- [auth-rsa.c] - fix user/1056, sshd keeps restrictions; dbt@meat.net - [sshconnect.c] - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags. - destroy keys earlier - split key exchange (kex) and user authentication (user-auth), ok: provos@ - [sshd.c] - no need for poll.h; from bright@wintelcom.net - disable agent fwding for proto 1.3, remove abuse of auth-rsa flags. - split key exchange (kex) and user authentication (user-auth), ok: provos@
Diffstat (limited to 'auth-rsa.c')
-rw-r--r--auth-rsa.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/auth-rsa.c b/auth-rsa.c
index bc53b049..9d9e7492 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -16,7 +16,7 @@
*/
#include "includes.h"
-RCSID("$Id: auth-rsa.c,v 1.11 1999/12/06 00:47:28 damien Exp $");
+RCSID("$Id: auth-rsa.c,v 1.12 2000/01/20 11:44:09 damien Exp $");
#include "rsa.h"
#include "packet.h"
@@ -415,7 +415,22 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
packet_send_debug("Your host '%.200s' is not permitted to use this key for login.",
get_canonical_hostname());
xfree(patterns);
+ /* key invalid for this host, reset flags */
authenticated = 0;
+ no_agent_forwarding_flag = 0;
+ no_port_forwarding_flag = 0;
+ no_pty_flag = 0;
+ no_x11_forwarding_flag = 0;
+ while (custom_environment) {
+ struct envstring *ce = custom_environment;
+ custom_environment = ce->next;
+ xfree(ce->s);
+ xfree(ce);
+ }
+ if (forced_command) {
+ xfree(forced_command);
+ forced_command = NULL;
+ }
break;
}
xfree(patterns);