oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
appl/ftp/ftp/gssapi.c
View File

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

2
appl/gssmask/gssmask.c
View File

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

2
appl/telnet/libtelnet/kerberos5.c
View File

@@ -605,7 +605,7 @@ kerberos5_is(Authenticator *ap, unsigned char *data, int cnt)
if (ret2 != -1) if (ret2 != -1)
errbuf2 = errbuf; errbuf2 = errbuf;
Data(ap, KRB_FORWARD_REJECT, errbuf, -1); 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) if (ret2 != -1)
free (errbuf); free (errbuf);

4
lib/gssapi/krb5/accept_sec_context.c
View File

@@ -104,7 +104,6 @@ _gsskrb5_register_acceptor_identity(OM_uint32 *min_stat, const char *identity)
void void
_gsskrb5i_is_cfx(krb5_context context, gsskrb5_ctx ctx, int acceptor) _gsskrb5i_is_cfx(krb5_context context, gsskrb5_ctx ctx, int acceptor)
{ {
krb5_error_code ret;
krb5_keyblock *key; krb5_keyblock *key;
if (acceptor) { if (acceptor) {
@@ -144,7 +143,8 @@ _gsskrb5i_is_cfx(krb5_context context, gsskrb5_ctx ctx, int acceptor)
} }
if (ctx->crypto) if (ctx->crypto)
krb5_crypto_destroy(context, ctx->crypto); krb5_crypto_destroy(context, ctx->crypto);
ret = krb5_crypto_init(context, key, 0, &ctx->crypto); /* XXX We really shouldn't ignore this; will come back to this */
(void) krb5_crypto_init(context, key, 0, &ctx->crypto);
} }

3
lib/gssapi/mech/gss_acquire_cred_ext.c
View File

@@ -152,7 +152,6 @@ _gss_acquire_cred_ext(OM_uint32 *minor_status,
for (i = 0; i < mechs->count; i++) { for (i = 0; i < mechs->count; i++) {
struct _gss_mechanism_name *mn = NULL; struct _gss_mechanism_name *mn = NULL;
struct _gss_mechanism_cred *mc = NULL; struct _gss_mechanism_cred *mc = NULL;
gss_name_t desired_mech_name = GSS_C_NO_NAME;
m = __gss_get_mechanism(&mechs->elements[i]); m = __gss_get_mechanism(&mechs->elements[i]);
if (!m) if (!m)
@@ -163,8 +162,6 @@ _gss_acquire_cred_ext(OM_uint32 *minor_status,
&mechs->elements[i], &mn); &mechs->elements[i], &mn);
if (major_status != GSS_S_COMPLETE) if (major_status != GSS_S_COMPLETE)
continue; continue;
desired_mech_name = mn->gmn_name;
} }
major_status = _gss_acquire_mech_cred(minor_status, m, mn, major_status = _gss_acquire_mech_cred(minor_status, m, mn,

4
lib/gssapi/mech/gss_delete_sec_context.c
View File

@@ -33,7 +33,7 @@ gss_delete_sec_context(OM_uint32 *minor_status,
gss_ctx_id_t *context_handle, gss_ctx_id_t *context_handle,
gss_buffer_t output_token) gss_buffer_t output_token)
{ {
OM_uint32 major_status; OM_uint32 major_status = GSS_S_COMPLETE;
struct _gss_context *ctx = (struct _gss_context *) *context_handle; struct _gss_context *ctx = (struct _gss_context *) *context_handle;
if (output_token) if (output_token)
@@ -53,5 +53,5 @@ gss_delete_sec_context(OM_uint32 *minor_status,
*context_handle = GSS_C_NO_CONTEXT; *context_handle = GSS_C_NO_CONTEXT;
} }
return (GSS_S_COMPLETE); return (major_status);
} }

12
lib/gssapi/test_common.c
View File

@@ -38,7 +38,7 @@
char * char *
gssapi_err(OM_uint32 maj_stat, OM_uint32 min_stat, gss_OID mech) gssapi_err(OM_uint32 maj_stat, OM_uint32 min_stat, gss_OID mech)
{ {
OM_uint32 disp_min_stat, disp_maj_stat; OM_uint32 disp_min_stat;
gss_buffer_desc maj_error_message; gss_buffer_desc maj_error_message;
gss_buffer_desc min_error_message; gss_buffer_desc min_error_message;
OM_uint32 msg_ctx = 0; OM_uint32 msg_ctx = 0;
@@ -50,12 +50,10 @@ gssapi_err(OM_uint32 maj_stat, OM_uint32 min_stat, gss_OID mech)
min_error_message.length = 0; min_error_message.length = 0;
min_error_message.value = NULL; min_error_message.value = NULL;
disp_maj_stat = gss_display_status(&disp_min_stat, maj_stat, (void) gss_display_status(&disp_min_stat, maj_stat, GSS_C_GSS_CODE,
GSS_C_GSS_CODE, mech, &msg_ctx, &maj_error_message);
mech, &msg_ctx, &maj_error_message); (void) gss_display_status(&disp_min_stat, min_stat, GSS_C_MECH_CODE,
disp_maj_stat = gss_display_status(&disp_min_stat, min_stat, mech, &msg_ctx, &min_error_message);
GSS_C_MECH_CODE,
mech, &msg_ctx, &min_error_message);
if (asprintf(&ret, "gss-code: %lu %.*s -- mech-code: %lu %.*s", if (asprintf(&ret, "gss-code: %lu %.*s -- mech-code: %lu %.*s",
(unsigned long)maj_stat, (unsigned long)maj_stat,
(int)maj_error_message.length, (int)maj_error_message.length,

3
lib/kadm5/ipropd_master.c
View File

@@ -770,10 +770,9 @@ main(int argc, char **argv)
slave *slaves = NULL; slave *slaves = NULL;
uint32_t current_version = 0, old_version = 0; uint32_t current_version = 0, old_version = 0;
krb5_keytab keytab; krb5_keytab keytab;
int optidx;
char **files; char **files;
optidx = krb5_program_setup(&context, argc, argv, args, num_args, NULL); (void) krb5_program_setup(&context, argc, argv, args, num_args, NULL);
if(help_flag) if(help_flag)
krb5_std_usage(0, args, num_args); krb5_std_usage(0, args, num_args);

2
lib/kadm5/ipropd_slave.c
View File

@@ -191,13 +191,11 @@ receive_loop (krb5_context context,
*/ */
do { do {
int32_t len, timestamp, tmp; int32_t len, timestamp, tmp;
enum kadm_ops op;
if(krb5_ret_int32 (sp, &vers) != 0) if(krb5_ret_int32 (sp, &vers) != 0)
return; return;
krb5_ret_int32 (sp, &timestamp); krb5_ret_int32 (sp, &timestamp);
krb5_ret_int32 (sp, &tmp); krb5_ret_int32 (sp, &tmp);
op = tmp;
krb5_ret_int32 (sp, &len); krb5_ret_int32 (sp, &len);
if ((uint32_t)vers <= server_context->log_context.version) if ((uint32_t)vers <= server_context->log_context.version)
krb5_storage_seek(sp, len + 8, SEEK_CUR); krb5_storage_seek(sp, len + 8, SEEK_CUR);

14
lib/krb5/warn.c
View File

@@ -86,6 +86,12 @@ _warnerr(krb5_context context, int do_errtext,
ret = _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); \ ret = _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); \
va_end(ap); va_end(ap);
#define FUNC_NORET(ETEXT, CODE, LEVEL) \
va_list ap; \
va_start(ap, fmt); \
(void) _warnerr(context, ETEXT, CODE, LEVEL, fmt, ap); \
va_end(ap);
#undef __attribute__ #undef __attribute__
#define __attribute__(X) #define __attribute__(X)
@@ -202,7 +208,7 @@ krb5_err(krb5_context context, int eval, krb5_error_code code,
const char *fmt, ...) const char *fmt, ...)
__attribute__ ((noreturn, format (printf, 4, 5))) __attribute__ ((noreturn, format (printf, 4, 5)))
{ {
FUNC(1, code, 0); FUNC_NORET(1, code, 0);
exit(eval); exit(eval);
UNREACHABLE(return 0); UNREACHABLE(return 0);
} }
@@ -241,7 +247,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_errx(krb5_context context, int eval, const char *fmt, ...) krb5_errx(krb5_context context, int eval, const char *fmt, ...)
__attribute__ ((noreturn, format (printf, 3, 4))) __attribute__ ((noreturn, format (printf, 3, 4)))
{ {
FUNC(0, 0, 0); FUNC_NORET(0, 0, 0);
exit(eval); exit(eval);
UNREACHABLE(return 0); UNREACHABLE(return 0);
} }
@@ -283,7 +289,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...) krb5_abort(krb5_context context, krb5_error_code code, const char *fmt, ...)
__attribute__ ((noreturn, format (printf, 3, 4))) __attribute__ ((noreturn, format (printf, 3, 4)))
{ {
FUNC(1, code, 0); FUNC_NORET(1, code, 0);
abort(); abort();
UNREACHABLE(return 0); UNREACHABLE(return 0);
} }
@@ -311,7 +317,7 @@ KRB5_LIB_FUNCTION krb5_error_code KRB5_LIB_CALL
krb5_abortx(krb5_context context, const char *fmt, ...) krb5_abortx(krb5_context context, const char *fmt, ...)
__attribute__ ((noreturn, format (printf, 2, 3))) __attribute__ ((noreturn, format (printf, 2, 3)))
{ {
FUNC(0, 0, 0); FUNC_NORET(0, 0, 0);
abort(); abort();
UNREACHABLE(return 0); UNREACHABLE(return 0);
} }

2
lib/ntlm/ntlm_err.et
View File

@@ -14,7 +14,7 @@ error_code RAND, "Random generator failed"
error_code AUTH, "NTLM authentication failed" error_code AUTH, "NTLM authentication failed"
error_code TIME_SKEW, "Client time skewed to server" error_code TIME_SKEW, "Client time skewed to server"
error_code OEM, "Client set OEM string" error_code OEM, "Client set OEM string"
error_code MISSING_NAME_SEPARATOR, "missing @ or \\ in name" error_code MISSING_NAME_SEPARATOR, "missing @ or \\\\ in name"
error_code MISSING_BUFFER, "missing expected buffer" error_code MISSING_BUFFER, "missing expected buffer"
error_code INVALID_APOP, "Invalid APOP response" error_code INVALID_APOP, "Invalid APOP response"
error_code INVALID_CRAM_MD5, "Invalid CRAM-MD5 response" error_code INVALID_CRAM_MD5, "Invalid CRAM-MD5 response"