summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2018-07-11 10:03:34 +1000
committerDarren Tucker <dtucker@dtucker.net>2018-07-11 10:11:17 +1000
commit380320bb72cc353a901790ab04b6287fd335dc4a (patch)
tree8a0df95b0b629f31f9e0b175f2272c939b28abab
parentd20720d373d8563ee737d1a45dc5e0804d622dbc (diff)
Supply some more missing "int r" in skey
-rw-r--r--monitor.c2
-rw-r--r--monitor_wrap.c3
2 files changed, 3 insertions, 2 deletions
diff --git a/monitor.c b/monitor.c
index 14abc1bca..56d136c29 100644
--- a/monitor.c
+++ b/monitor.c
@@ -996,7 +996,7 @@ mm_answer_skeyrespond(int sock, struct sshbuf *m)
996{ 996{
997 char *response; 997 char *response;
998 size_t rlen; 998 size_t rlen;
999 int authok; 999 int authok, r;
1000 1000
1001 if ((r = sshbuf_get_cstring(m, &response, &rlen)) != 0) 1001 if ((r = sshbuf_get_cstring(m, &response, &rlen)) != 0)
1002 fatal("%s: buffer error: %s", __func__, ssh_err(r)); 1002 fatal("%s: buffer error: %s", __func__, ssh_err(r));
diff --git a/monitor_wrap.c b/monitor_wrap.c
index f291ac085..1409a1e55 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -885,6 +885,7 @@ mm_skey_query(void *ctx, char **name, char **infotxt,
885 struct sshbuf *m; 885 struct sshbuf *m;
886 u_int success; 886 u_int success;
887 char *challenge; 887 char *challenge;
888 int r;
888 889
889 debug3("%s: entering", __func__); 890 debug3("%s: entering", __func__);
890 891
@@ -920,7 +921,7 @@ int
920mm_skey_respond(void *ctx, u_int numresponses, char **responses) 921mm_skey_respond(void *ctx, u_int numresponses, char **responses)
921{ 922{
922 struct sshbuf *m; 923 struct sshbuf *m;
923 int authok; 924 int authok, r;
924 925
925 debug3("%s: entering", __func__); 926 debug3("%s: entering", __func__);
926 if (numresponses != 1) 927 if (numresponses != 1)