Support multiple anchor name types now that Jacob has enhanced

[u/mdw/putty] / ssh.c

diff --git a/ssh.c b/ssh.c
index 7f3748a..e202dbb 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -3337,6 +3337,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
                    bombout(("TIS challenge packet was badly formed"));
                    crStop(0);
                }
+               c_write_str(ssh, "Using TIS authentication.\r\n");
                logevent("Received TIS challenge");
                if (challengelen > sizeof(s->prompt) - 1)
                    challengelen = sizeof(s->prompt) - 1;/* prevent overrun */
@@ -3370,6 +3371,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
                    bombout(("CryptoCard challenge packet was badly formed"));
                    crStop(0);
                }
+               c_write_str(ssh, "Using CryptoCard authentication.\r\n");
                logevent("Received CryptoCard challenge");
                if (challengelen > sizeof(s->prompt) - 1)
                    challengelen = sizeof(s->prompt) - 1;/* prevent overrun */
@@ -3682,10 +3684,8 @@ void sshfwd_close(struct ssh_channel *c)
 {
     Ssh ssh = c->ssh;
 
-    if (ssh->state != SSH_STATE_SESSION) {
-       assert(ssh->state == SSH_STATE_CLOSED);
+    if (ssh->state == SSH_STATE_CLOSED)
        return;
-    }
 
     if (c && !c->closes) {
        /*
@@ -3722,10 +3722,8 @@ int sshfwd_write(struct ssh_channel *c, char *buf, int len)
 {
     Ssh ssh = c->ssh;
 
-    if (ssh->state != SSH_STATE_SESSION) {
-       assert(ssh->state == SSH_STATE_CLOSED);
+    if (ssh->state == SSH_STATE_CLOSED)
        return 0;
-    }
 
     if (ssh->version == 1) {
        send_packet(ssh, SSH1_MSG_CHANNEL_DATA,
@@ -3751,10 +3749,8 @@ void sshfwd_unthrottle(struct ssh_channel *c, int bufsize)
 {
     Ssh ssh = c->ssh;
 
-    if (ssh->state != SSH_STATE_SESSION) {
-       assert(ssh->state == SSH_STATE_CLOSED);
+    if (ssh->state == SSH_STATE_CLOSED)
        return;
-    }
 
     if (ssh->version == 1) {
        if (c->v.v1.throttling && bufsize < SSH1_BUFFER_LIMIT) {
@@ -6808,6 +6804,7 @@ static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
                    continue;
                }
 
+               c_write_str(ssh, "Using keyboard-interactive authentication.\r\n");
                s->kbd_inter_running = TRUE;
                s->curr_prompt = 0;
            }