tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/04/05 00:14:00 

[auth2-gss.c krl.c sshconnect2.c]
     hush some {unused, printf type} warnings
This commit is contained in:
Damien Miller 2013-04-23 15:18:51 +10:00
parent 508b6c3d3b
commit d677ad14ff
4 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -25,6 +25,9 @@
- djm@cvs.openbsd.org 2013/03/08 06:32:58 - djm@cvs.openbsd.org 2013/03/08 06:32:58
[ssh.c] [ssh.c]
allow "ssh -f none ..." ok markus@ allow "ssh -f none ..." ok markus@
- djm@cvs.openbsd.org 2013/04/05 00:14:00
[auth2-gss.c krl.c sshconnect2.c]
hush some {unused, printf type} warnings
20130418 20130418
- (djm) [config.guess config.sub] Update to last versions before they switch - (djm) [config.guess config.sub] Update to last versions before they switch

5
auth2-gss.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: auth2-gss.c,v 1.18 2012/12/02 20:34:09 djm Exp $ */ /* $OpenBSD: auth2-gss.c,v 1.19 2013/04/05 00:14:00 djm Exp $ */
/* /*
* Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved. * Copyright (c) 2001-2003 Simon Wilkinson. All rights reserved.
@ -229,14 +229,11 @@ static void
input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt)
{ {
Authctxt *authctxt = ctxt; Authctxt *authctxt = ctxt;
Gssctxt *gssctxt;
int authenticated; int authenticated;
if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep))
fatal("No authentication or GSSAPI context"); fatal("No authentication or GSSAPI context");
gssctxt = authctxt->methoddata;
/* /*
* We don't need to check the status, because we're only enabled in * We don't need to check the status, because we're only enabled in
* the dispatcher once the exchange is complete * the dispatcher once the exchange is complete

17
krl.c
View File

@ -14,7 +14,7 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $OpenBSD: krl.c,v 1.10 2013/02/19 02:12:47 dtucker Exp $ */ /* $OpenBSD: krl.c,v 1.11 2013/04/05 00:14:00 djm Exp $ */
#include "includes.h" #include "includes.h"
@ -502,8 +502,11 @@ choose_next_state(int current_state, u_int64_t contig, int final,
} }
debug3("%s: contig %llu last_gap %llu next_gap %llu final %d, costs:" debug3("%s: contig %llu last_gap %llu next_gap %llu final %d, costs:"
"list %llu range %llu bitmap %llu new bitmap %llu, " "list %llu range %llu bitmap %llu new bitmap %llu, "
"selected 0x%02x%s", __func__, contig, last_gap, next_gap, final, "selected 0x%02x%s", __func__, (long long unsigned)contig,
cost_list, cost_range, cost_bitmap, cost_bitmap_restart, new_state, (long long unsigned)last_gap, (long long unsigned)next_gap, final,
(long long unsigned)cost_list, (long long unsigned)cost_range,
(long long unsigned)cost_bitmap,
(long long unsigned)cost_bitmap_restart, new_state,
*force_new_section ? " restart" : ""); *force_new_section ? " restart" : "");
return new_state; return new_state;
} }
@ -539,7 +542,8 @@ revoked_certs_generate(struct revoked_certs *rc, Buffer *buf)
rs != NULL; rs != NULL;
rs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs)) { rs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs)) {
debug3("%s: serial %llu:%llu state 0x%02x", __func__, debug3("%s: serial %llu:%llu state 0x%02x", __func__,
rs->lo, rs->hi, state); (long long unsigned)rs->lo, (long long unsigned)rs->hi,
state);
/* Check contiguous length and gap to next section (if any) */ /* Check contiguous length and gap to next section (if any) */
nrs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs); nrs = RB_NEXT(revoked_serial_tree, &rc->revoked_serials, rs);
@ -928,8 +932,9 @@ ssh_krl_from_blob(Buffer *buf, struct ssh_krl **krlp,
} }
format_timestamp(krl->generated_date, timestamp, sizeof(timestamp)); format_timestamp(krl->generated_date, timestamp, sizeof(timestamp));
debug("KRL version %llu generated at %s%s%s", krl->krl_version, debug("KRL version %llu generated at %s%s%s",
timestamp, *krl->comment ? ": " : "", krl->comment); (long long unsigned)krl->krl_version, timestamp,
*krl->comment ? ": " : "", krl->comment);
/* /*
* 1st pass: verify signatures, if any. This is done to avoid * 1st pass: verify signatures, if any. This is done to avoid

11
sshconnect2.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect2.c,v 1.193 2013/03/05 20:16:09 markus Exp $ */ /* $OpenBSD: sshconnect2.c,v 1.194 2013/04/05 00:14:00 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Damien Miller. All rights reserved. * Copyright (c) 2008 Damien Miller. All rights reserved.
@ -810,7 +810,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
Gssctxt *gssctxt; Gssctxt *gssctxt;
gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER; gss_buffer_desc send_tok = GSS_C_EMPTY_BUFFER;
gss_buffer_desc recv_tok; gss_buffer_desc recv_tok;
OM_uint32 status, ms; OM_uint32 ms;
u_int len; u_int len;
if (authctxt == NULL) if (authctxt == NULL)
@ -823,7 +823,7 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
packet_check_eom(); packet_check_eom();
/* Stick it into GSSAPI and see what it says */ /* Stick it into GSSAPI and see what it says */
status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, (void)ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds,
&recv_tok, &send_tok, NULL); &recv_tok, &send_tok, NULL);
xfree(recv_tok.value); xfree(recv_tok.value);
@ -836,12 +836,11 @@ input_gssapi_errtok(int type, u_int32_t plen, void *ctxt)
void void
input_gssapi_error(int type, u_int32_t plen, void *ctxt) input_gssapi_error(int type, u_int32_t plen, void *ctxt)
{ {
OM_uint32 maj, min;
char *msg; char *msg;
char *lang; char *lang;
maj=packet_get_int(); /* maj */(void)packet_get_int();
min=packet_get_int(); /* min */(void)packet_get_int();
msg=packet_get_string(NULL); msg=packet_get_string(NULL);
lang=packet_get_string(NULL); lang=packet_get_string(NULL);