(add_padata): change types to make everything work out
(krb5_get_in_cred): remove const to make types match git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@7740 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -347,14 +347,14 @@ add_padata(krb5_context context,
|
|||||||
krb5_principal client,
|
krb5_principal client,
|
||||||
krb5_key_proc key_proc,
|
krb5_key_proc key_proc,
|
||||||
krb5_const_pointer keyseed,
|
krb5_const_pointer keyseed,
|
||||||
krb5_enctype *enctypes,
|
int *enctypes,
|
||||||
unsigned netypes,
|
unsigned netypes,
|
||||||
krb5_salt *salt)
|
krb5_salt *salt)
|
||||||
{
|
{
|
||||||
krb5_error_code ret;
|
krb5_error_code ret;
|
||||||
PA_DATA *pa2;
|
PA_DATA *pa2;
|
||||||
krb5_salt salt2;
|
krb5_salt salt2;
|
||||||
krb5_enctype *ep;
|
int *ep;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if(salt == NULL) {
|
if(salt == NULL) {
|
||||||
@@ -363,7 +363,7 @@ add_padata(krb5_context context,
|
|||||||
salt = &salt2;
|
salt = &salt2;
|
||||||
}
|
}
|
||||||
if (!enctypes) {
|
if (!enctypes) {
|
||||||
enctypes = context->etypes; /* XXX */
|
enctypes = (int *)context->etypes; /* XXX */
|
||||||
netypes = 0;
|
netypes = 0;
|
||||||
for (ep = enctypes; *ep != ETYPE_NULL; ep++)
|
for (ep = enctypes; *ep != ETYPE_NULL; ep++)
|
||||||
netypes++;
|
netypes++;
|
||||||
@@ -622,7 +622,7 @@ krb5_get_in_cred(krb5_context context,
|
|||||||
krb5_kdc_flags opts;
|
krb5_kdc_flags opts;
|
||||||
PA_DATA *pa;
|
PA_DATA *pa;
|
||||||
krb5_enctype etype;
|
krb5_enctype etype;
|
||||||
const krb5_preauthdata *my_preauth = NULL;
|
krb5_preauthdata *my_preauth = NULL;
|
||||||
unsigned nonce;
|
unsigned nonce;
|
||||||
int done;
|
int done;
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user