More fixes for -Werror (GCC 4.6 catches more stuff)

This commit is contained in:
Nicolas Williams
2011-11-02 23:18:55 -05:00
parent 3bebbe5323
commit 40a7d4b62f
11 changed files with 31 additions and 34 deletions

View File

@@ -114,20 +114,21 @@ gss_overhead(void *app_data, int level, int len)
static int
gss_encode(void *app_data, void *from, int length, int level, void **to)
{
OM_uint32 maj_stat, min_stat;
OM_uint32 min_stat;
gss_buffer_desc input, output;
int conf_state;
struct gssapi_data *d = app_data;
input.length = length;
input.value = from;
maj_stat = gss_wrap (&min_stat,
d->context_hdl,
level == prot_private,
GSS_C_QOP_DEFAULT,
&input,
&conf_state,
&output);
/* XXX We should really display the major status... */
(void) gss_wrap(&min_stat,
d->context_hdl,
level == prot_private,
GSS_C_QOP_DEFAULT,
&input,
&conf_state,
&output);
*to = output.value;
return output.length;
}

View File

@@ -427,7 +427,6 @@ HandleOP(AcceptContext)
gss_ctx_id_t ctx;
gss_cred_id_t deleg_cred = GSS_C_NO_CREDENTIAL;
gss_buffer_desc input_token, output_token;
gss_buffer_t input_token_ptr = GSS_C_NO_BUFFER;
ret32(c, hContext);
ret32(c, flags);
@@ -440,7 +439,6 @@ HandleOP(AcceptContext)
if (in_token.length) {
input_token.length = in_token.length;
input_token.value = in_token.data;
input_token_ptr = &input_token;
} else {
input_token.length = 0;
input_token.value = NULL;

View File

@@ -605,7 +605,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
if (ret2 != -1)
errbuf2 = errbuf;
Data(ap, KRB_FORWARD_REJECT, errbuf, -1);
log_message("Could not read forwarded credentials: %s", errbuf);
log_message("Could not read forwarded credentials: %s", errbuf2);
if (ret2 != -1)
free (errbuf);