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

Fixes to make Heimdal -Wall -Werror clean

Browse Source 
These fixes make developer mode build, at least on Ubuntu.
This commit is contained in:
Nicolas Williams
2011-11-02 21:39:07 -05:00
parent 9c830f5237
commit 3bebbe5323
24 changed files with 286 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/krb5/crypto.c
View File

@@ -2033,7 +2033,7 @@ krb5_crypto_init(krb5_context context,
krb5_set_error_message(context, ENOMEM, N_("malloc: out of memory", ""));
return ENOMEM;
}
if(etype == ETYPE_NULL)
if(etype == (krb5_enctype)ETYPE_NULL)
etype = key->keytype;
(*crypto)->et = _krb5_find_enctype(etype);
if((*crypto)->et == NULL || ((*crypto)->et->flags & F_DISABLED)) {

8
lib/krb5/deprecated.c
View File

@@ -31,8 +31,14 @@
* SUCH DAMAGE.
*/
#ifdef __GNUC__
/* For some GCCs there's no way to shut them up about deprecated functions */
#define KRB5_DEPRECATED_FUNCTION(x)
#endif
#include "krb5_locl.h"
#undef __attribute__
#define __attribute__(x)
@@ -72,7 +78,7 @@ krb5_keytype_to_enctypes_default (krb5_context context,
unsigned int i, n;
krb5_enctype *ret;
if (keytype != KEYTYPE_DES || context->etypes_des == NULL)
if (keytype != (krb5_keytype)KEYTYPE_DES || context->etypes_des == NULL)
return krb5_keytype_to_enctypes (context, keytype, len, val);
for (n = 0; context->etypes_des[n]; ++n)

2
lib/krb5/generate_subkey.c
View File

@@ -60,7 +60,7 @@ krb5_generate_subkey_extended(krb5_context context,
return ENOMEM;
}
if (etype == ETYPE_NULL)
if (etype == (krb5_enctype)ETYPE_NULL)
etype = key->keytype; /* use session key etype */
/* XXX should we use the session key as input to the RF? */

4
lib/krb5/get_in_tkt.c
View File

@@ -31,6 +31,8 @@
* SUCH DAMAGE.
*/
#define KRB5_DEPRECATED_FUNCTION(x)
#include "krb5_locl.h"
#ifndef HEIMDAL_SMALLER
@@ -113,7 +115,7 @@ add_padata(krb5_context context,
if (!enctypes) {
enctypes = context->etypes;
netypes = 0;
for (ep = enctypes; *ep != ETYPE_NULL; ep++)
for (ep = enctypes; *ep != (krb5_enctype)ETYPE_NULL; ep++)
netypes++;
}
pa2 = realloc (md->val, (md->len + netypes) * sizeof(*md->val));

2
lib/krb5/init_creds_pw.c
View File

@@ -1024,7 +1024,7 @@ add_enc_ts_padata(krb5_context context,
if (!enctypes) {
enctypes = context->etypes;
netypes = 0;
for (ep = enctypes; *ep != ETYPE_NULL; ep++)
for (ep = enctypes; *ep != (krb5_enctype)ETYPE_NULL; ep++)
netypes++;
}

2
lib/krb5/rd_cred.c
View File

@@ -96,7 +96,7 @@ krb5_rd_cred(krb5_context context,
goto out;
}
if (cred.enc_part.etype == ETYPE_NULL) {
if (cred.enc_part.etype == (krb5_enctype)ETYPE_NULL) {
/* DK: MIT GSS-API Compatibility */
enc_krb_cred_part_data.length = cred.enc_part.cipher.length;
enc_krb_cred_part_data.data = cred.enc_part.cipher.data;

2
lib/krb5/rd_req.c
View File

@@ -484,7 +484,7 @@ krb5_verify_ap_req2(krb5_context context,
if (ap_req_options) {
*ap_req_options = 0;
if (ac->keytype != ETYPE_NULL)
if (ac->keytype != (krb5_enctype)ETYPE_NULL)
*ap_req_options |= AP_OPTS_USE_SUBKEY;
if (ap_req->ap_options.use_session_key)
*ap_req_options |= AP_OPTS_USE_SESSION_KEY;