diff options
author | Damien Miller <djm@mindrot.org> | 2013-04-23 15:18:51 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2013-04-23 15:18:51 +1000 |
commit | d677ad14ff7efedf21745ee1694058350e758e18 (patch) | |
tree | 02abe5bd33079ec3cf77e40634d5d1e60b7bb6ef | |
parent | 508b6c3d3b95c8ec078fd4801368597ab29b2db9 (diff) |
- djm@cvs.openbsd.org 2013/04/05 00:14:00
[auth2-gss.c krl.c sshconnect2.c]
hush some {unused, printf type} warnings
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | auth2-gss.c | 5 | ||||
-rw-r--r-- | krl.c | 17 | ||||
-rw-r--r-- | sshconnect2.c | 11 |
4 files changed, 20 insertions, 16 deletions
@@ -25,6 +25,9 @@ | |||
25 | - djm@cvs.openbsd.org 2013/03/08 06:32:58 | 25 | - djm@cvs.openbsd.org 2013/03/08 06:32:58 |
26 | [ssh.c] | 26 | [ssh.c] |
27 | allow "ssh -f none ..." ok markus@ | 27 | allow "ssh -f none ..." ok markus@ |
28 | - djm@cvs.openbsd.org 2013/04/05 00:14:00 | ||
29 | [auth2-gss.c krl.c sshconnect2.c] | ||
30 | hush some {unused, printf type} warnings | ||
28 | 31 | ||
29 | 20130418 | 32 | 20130418 |
30 | - (djm) [config.guess config.sub] Update to last versions before they switch | 33 | - (djm) [config.guess config.sub] Update to last versions before they switch |
diff --git a/auth2-gss.c b/auth2-gss.c index 93d576bfb..de1bd0644 100644 --- a/auth2-gss.c +++ b/auth2-gss.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth2-gss.c,v 1.18 2012/12/02 20:34:09 djm Exp $ */ | 1 | /* $OpenBSD: auth2-gss.c,v 1.19 2013/04/05 00:14:00 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. | 4 | * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. |
@@ -229,14 +229,11 @@ static void | |||
229 | input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) | 229 | input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) |
230 | { | 230 | { |
231 | Authctxt *authctxt = ctxt; | 231 | Authctxt *authctxt = ctxt; |
232 | Gssctxt *gssctxt; | ||
233 | int authenticated; | 232 | int authenticated; |
234 | 233 | ||
235 | if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) | 234 | if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) |
236 | fatal("No authentication or GSSAPI context"); | 235 | fatal("No authentication or GSSAPI context"); |
237 | 236 | ||
238 | gssctxt = authctxt->methoddata; | ||
239 | |||
240 | /* | 237 | /* |
241 | * We don't need to check the status, because we're only enabled in | 238 | * We don't need to check the status, because we're only enabled in |
242 | * the dispatcher once the exchange is complete | 239 | * the dispatcher once the exchange is complete |
@@ -14,7 +14,7 @@ | |||
14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | /* $OpenBSD: krl.c,v 1.10 2013/02/19 02:12:47 dtucker Exp $ */ | 17 | /* $OpenBSD: krl.c,v 1.11 2013/04/05 00:14:00 djm Exp $ */ |
18 | 18 | ||
19 | #include "includes.h" | 19 | #include "includes.h" |
20 | 20 | ||
@@ -502,8 +502,11 @@ choose_next_state(int current_state, u_int64_t contig, int final, | |||
502 | } | 502 | } |
503 | debug3("%s: contig %llu last_gap %llu next_gap %llu final %d, costs:" | 503 | debug3("%s: contig %llu last_gap %llu next_gap %llu final %d, costs:" |
504 | "list %llu range %llu bitmap %llu new bitmap %llu, " | 504 | "list %llu range %llu bitmap %llu new bitmap %llu, " |
505 | "selected 0x%02x%s", __func__, contig, last_gap, next_gap, final, | 505 | "selected 0x%02x%s", __func__, (long long unsigned)contig, |
506 | cost_list, cost_range, cost_bitmap, cost_bitmap_restart, new_state, | 506 | (long long unsigned)last_gap, (long long unsigned)next_gap, final, |
507 | (long long unsigned)cost_list, (long long unsigned)cost_range, | ||
508 | (long long unsigned)cost_bitmap, | ||
509 | (long long unsigned)cost_bitmap_restart, new_state, | ||
507 | *force_new_section ? " restart" : ""); | 510 | *force_new_section ? " restart" : ""); |
508 | return new_state; | 511 | return new_state; |
509 | } | 512 | } |
@@ -539,7 +542,8 @@ revoked_certs_generate(struct revoked_certs *rc, Buffer *buf) | |||
539 | rs != NULL; | 542 | rs != NULL; |
540 | rs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs)) { | 543 | rs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs)) { |
541 | debug3("%s: serial %llu:%llu state 0x%02x", __func__, | 544 | debug3("%s: serial %llu:%llu state 0x%02x", __func__, |
542 | rs->lo, rs->hi, state); | 545 | (long long unsigned)rs->lo, (long long unsigned)rs->hi, |
546 | state); | ||
543 | 547 | ||
544 | /* Check contiguous length and gap to next section (if any) */ | 548 | /* Check contiguous length and gap to next section (if any) */ |
545 | nrs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs); | 549 | nrs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs); |
@@ -928,8 +932,9 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp, | |||
928 | } | 932 | } |
929 | 933 | ||
930 | format_timestamp(krl->generated_date, timestamp, sizeof(timestamp)); | 934 | format_timestamp(krl->generated_date, timestamp, sizeof(timestamp)); |
931 | debug("KRL version %llu generated at %s%s%s", krl->krl_version, | 935 | debug("KRL version %llu generated at %s%s%s", |
932 | timestamp, *krl->comment ? ": " : "", krl->comment); | 936 | (long long unsigned)krl->krl_version, timestamp, |
937 | *krl->comment ? ": " : "", krl->comment); | ||
933 | 938 | ||
934 | /* | 939 | /* |
935 | * 1st pass: verify signatures, if any. This is done to avoid | 940 | * 1st pass: verify signatures, if any. This is done to avoid |
diff --git a/sshconnect2.c b/sshconnect2.c index 1a6a5850d..c811c3652 100644 --- a/sshconnect2.c +++ b/sshconnect2.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect2.c,v 1.193 2013/03/05 20:16:09 markus Exp $ */ | 1 | /* $OpenBSD: sshconnect2.c,v 1.194 2013/04/05 00:14:00 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Damien Miller. All rights reserved. | 4 | * Copyright (c) 2008 Damien Miller. All rights reserved. |
@@ -810,7 +810,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
810 | Gssctxt *gssctxt; | 810 | Gssctxt *gssctxt; |
811 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; | 811 | gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; |
812 | gss_buffer_desc recv_tok; | 812 | gss_buffer_desc recv_tok; |
813 | OM_uint32 status, ms; | 813 | OM_uint32 ms; |
814 | u_int len; | 814 | u_int len; |
815 | 815 | ||
816 | if (authctxt == NULL) | 816 | if (authctxt == NULL) |
@@ -823,7 +823,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
823 | packet_check_eom(); | 823 | packet_check_eom(); |
824 | 824 | ||
825 | /* Stick it into GSSAPI and see what it says */ | 825 | /* Stick it into GSSAPI and see what it says */ |
826 | status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, | 826 | (void)ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, |
827 | &recv_tok, &send_tok, NULL); | 827 | &recv_tok, &send_tok, NULL); |
828 | 828 | ||
829 | xfree(recv_tok.value); | 829 | xfree(recv_tok.value); |
@@ -836,12 +836,11 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt) | |||
836 | void | 836 | void |
837 | input_gssapi_error(int type, u_int32_t plen, void *ctxt) | 837 | input_gssapi_error(int type, u_int32_t plen, void *ctxt) |
838 | { | 838 | { |
839 | OM_uint32 maj, min; | ||
840 | char *msg; | 839 | char *msg; |
841 | char *lang; | 840 | char *lang; |
842 | 841 | ||
843 | maj=packet_get_int(); | 842 | /* maj */(void)packet_get_int(); |
844 | min=packet_get_int(); | 843 | /* min */(void)packet_get_int(); |
845 | msg=packet_get_string(NULL); | 844 | msg=packet_get_string(NULL); |
846 | lang=packet_get_string(NULL); | 845 | lang=packet_get_string(NULL); |
847 | 846 | ||