diff options
Diffstat (limited to 'monitor.c')
-rw-r--r-- | monitor.c | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor.c,v 1.37 2003/04/02 09:48:07 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor.c,v 1.36 2003/04/01 10:22:21 markus Exp $"); |
29 | 29 | ||
30 | #include <openssl/dh.h> | 30 | #include <openssl/dh.h> |
31 | 31 | ||
@@ -606,7 +606,7 @@ mm_answer_authpassword(int socket, Buffer *m) | |||
606 | passwd = buffer_get_string(m, &plen); | 606 | passwd = buffer_get_string(m, &plen); |
607 | /* Only authenticate if the context is valid */ | 607 | /* Only authenticate if the context is valid */ |
608 | authenticated = options.password_authentication && | 608 | authenticated = options.password_authentication && |
609 | authctxt->valid && auth_password(authctxt, passwd); | 609 | auth_password(authctxt, passwd) && authctxt->valid; |
610 | memset(passwd, 0, strlen(passwd)); | 610 | memset(passwd, 0, strlen(passwd)); |
611 | xfree(passwd); | 611 | xfree(passwd); |
612 | 612 | ||
@@ -870,7 +870,7 @@ monitor_valid_userblob(u_char *data, u_int datalen) | |||
870 | fail++; | 870 | fail++; |
871 | p = buffer_get_string(&b, NULL); | 871 | p = buffer_get_string(&b, NULL); |
872 | if (strcmp(authctxt->user, p) != 0) { | 872 | if (strcmp(authctxt->user, p) != 0) { |
873 | logit("wrong user name passed to monitor: expected %s != %.100s", | 873 | log("wrong user name passed to monitor: expected %s != %.100s", |
874 | authctxt->user, p); | 874 | authctxt->user, p); |
875 | fail++; | 875 | fail++; |
876 | } | 876 | } |
@@ -918,7 +918,7 @@ monitor_valid_hostbasedblob(u_char *data, u_int datalen, char *cuser, | |||
918 | fail++; | 918 | fail++; |
919 | p = buffer_get_string(&b, NULL); | 919 | p = buffer_get_string(&b, NULL); |
920 | if (strcmp(authctxt->user, p) != 0) { | 920 | if (strcmp(authctxt->user, p) != 0) { |
921 | logit("wrong user name passed to monitor: expected %s != %.100s", | 921 | log("wrong user name passed to monitor: expected %s != %.100s", |
922 | authctxt->user, p); | 922 | authctxt->user, p); |
923 | fail++; | 923 | fail++; |
924 | } | 924 | } |
@@ -1497,8 +1497,6 @@ mm_get_keystate(struct monitor *pmonitor) | |||
1497 | Buffer m; | 1497 | Buffer m; |
1498 | u_char *blob, *p; | 1498 | u_char *blob, *p; |
1499 | u_int bloblen, plen; | 1499 | u_int bloblen, plen; |
1500 | u_int32_t seqnr, packets; | ||
1501 | u_int64_t blocks; | ||
1502 | 1500 | ||
1503 | debug3("%s: Waiting for new keys", __func__); | 1501 | debug3("%s: Waiting for new keys", __func__); |
1504 | 1502 | ||
@@ -1528,14 +1526,8 @@ mm_get_keystate(struct monitor *pmonitor) | |||
1528 | xfree(blob); | 1526 | xfree(blob); |
1529 | 1527 | ||
1530 | /* Now get sequence numbers for the packets */ | 1528 | /* Now get sequence numbers for the packets */ |
1531 | seqnr = buffer_get_int(&m); | 1529 | packet_set_seqnr(MODE_OUT, buffer_get_int(&m)); |
1532 | blocks = buffer_get_int64(&m); | 1530 | packet_set_seqnr(MODE_IN, buffer_get_int(&m)); |
1533 | packets = buffer_get_int(&m); | ||
1534 | packet_set_state(MODE_OUT, seqnr, blocks, packets); | ||
1535 | seqnr = buffer_get_int(&m); | ||
1536 | blocks = buffer_get_int64(&m); | ||
1537 | packets = buffer_get_int(&m); | ||
1538 | packet_set_state(MODE_IN, seqnr, blocks, packets); | ||
1539 | 1531 | ||
1540 | skip: | 1532 | skip: |
1541 | /* Get the key context */ | 1533 | /* Get the key context */ |