new krb524_convert_creds_kdc_ccache
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@10113 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
@@ -218,7 +218,7 @@ krb5_to4 (krb5_ccache id)
|
|||||||
|
|
||||||
ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
|
ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
|
||||||
if(ret == 0) {
|
if(ret == 0) {
|
||||||
ret = krb524_convert_creds_kdc(context, id, &cred, &c);
|
ret = krb524_convert_creds_kdc_ccache(context, id, &cred, &c);
|
||||||
if(ret == 0) {
|
if(ret == 0) {
|
||||||
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
|
snprintf(krb4tkfile,sizeof(krb4tkfile),"%s%d",TKT_ROOT,
|
||||||
getuid());
|
getuid());
|
||||||
|
@@ -583,7 +583,7 @@ verify_krb5(const char *password)
|
|||||||
NULL);
|
NULL);
|
||||||
ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
|
ret = krb5_cc_retrieve_cred(context, id, 0, &mcred, &cred);
|
||||||
if(ret == 0) {
|
if(ret == 0) {
|
||||||
ret = krb524_convert_creds_kdc(context, id, &cred, &c);
|
ret = krb524_convert_creds_kdc_ccache(context, id, &cred, &c);
|
||||||
if(ret == 0)
|
if(ret == 0)
|
||||||
tf_setup(&c, c.pname, c.pinst);
|
tf_setup(&c, c.pname, c.pinst);
|
||||||
memset(&c, 0, sizeof(c));
|
memset(&c, 0, sizeof(c));
|
||||||
|
@@ -579,7 +579,7 @@ main (int argc, char **argv)
|
|||||||
#ifdef KRB4
|
#ifdef KRB4
|
||||||
if(get_v4_tgt) {
|
if(get_v4_tgt) {
|
||||||
CREDENTIALS c;
|
CREDENTIALS c;
|
||||||
ret = krb524_convert_creds_kdc(context, ccache, &cred, &c);
|
ret = krb524_convert_creds_kdc_ccache(context, ccache, &cred, &c);
|
||||||
if(ret)
|
if(ret)
|
||||||
krb5_warn(context, ret, "converting creds");
|
krb5_warn(context, ret, "converting creds");
|
||||||
else
|
else
|
||||||
|
@@ -100,7 +100,7 @@ get_ad_tkt(char *service, char *sinstance, char *realm, int lifetime)
|
|||||||
krb5_free_context(context);
|
krb5_free_context(context);
|
||||||
return KFAILURE;
|
return KFAILURE;
|
||||||
}
|
}
|
||||||
ret = krb524_convert_creds_kdc(context, id, out_creds, &cred);
|
ret = krb524_convert_creds_kdc_ccache(context, id, out_creds, &cred);
|
||||||
krb5_cc_close(context, id);
|
krb5_cc_close(context, id);
|
||||||
krb5_free_context(context);
|
krb5_free_context(context);
|
||||||
krb5_free_creds(context, out_creds);
|
krb5_free_creds(context, out_creds);
|
||||||
|
@@ -179,7 +179,7 @@ verify_krb5(struct passwd *pwd,
|
|||||||
free (realm);
|
free (realm);
|
||||||
ret = krb5_cc_retrieve_cred(context, ccache, 0, &mcred, &cred);
|
ret = krb5_cc_retrieve_cred(context, ccache, 0, &mcred, &cred);
|
||||||
if(ret == 0) {
|
if(ret == 0) {
|
||||||
ret = krb524_convert_creds_kdc(context, ccache, &cred, &c);
|
ret = krb524_convert_creds_kdc_ccache(context, ccache, &cred, &c);
|
||||||
if(ret)
|
if(ret)
|
||||||
krb5_warn(context, ret, "converting creds");
|
krb5_warn(context, ret, "converting creds");
|
||||||
else {
|
else {
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright (c) 1995, 1996, 1997, 1998, 1999 Kungliga Tekniska H<>gskolan
|
* Copyright (c) 1995 - 2000 Kungliga Tekniska H<>gskolan
|
||||||
* (Royal Institute of Technology, Stockholm, Sweden).
|
* (Royal Institute of Technology, Stockholm, Sweden).
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
@@ -65,7 +65,7 @@ get_cred(kafs_data *data, const char *name, const char *inst,
|
|||||||
krb5_free_principal(d->context, in_creds.client);
|
krb5_free_principal(d->context, in_creds.client);
|
||||||
if(ret)
|
if(ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = krb524_convert_creds_kdc(d->context, d->id, out_creds, c);
|
ret = krb524_convert_creds_kdc_ccache(d->context, d->id, out_creds, c);
|
||||||
krb5_free_creds(d->context, out_creds);
|
krb5_free_creds(d->context, out_creds);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user