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

Random fixes.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2813 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-08-08 22:02:02 +00:00
parent 52916db200
commit 9f0a5160aa
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lib/krb5/init_creds_pw.c
View File

@@ -90,7 +90,7 @@ init_cred (krb5_context context,
memset (cred, 0, sizeof(*cred)); memset (cred, 0, sizeof(*cred));
if (client) if (client)
cred->client = client; krb5_copy_principal(context, client, &cred->client);
else { else {
ret = krb5_get_default_principal (context, ret = krb5_get_default_principal (context,
&cred->client); &cred->client);
@@ -109,7 +109,7 @@ init_cred (krb5_context context,
tmp = parse_time(get_config_string (context, tmp = parse_time(get_config_string (context,
*client_realm, *client_realm,
"ticket_lifetime", "ticket_lifetime",
"36000"), "10h"),
NULL); NULL);
cred->times.endtime = time(NULL) + tmp; cred->times.endtime = time(NULL) + tmp;
@@ -131,15 +131,8 @@ init_cred (krb5_context context,
goto out; goto out;
krb5_princ_set_realm (context, cred->server, client_realm); krb5_princ_set_realm (context, cred->server, client_realm);
} else { } else {
ret = krb5_build_principal_ext (context, ret = krb5_make_principal(context, &cred->server,
&cred->server, *client_realm, "krbtgt", *client_realm, NULL);
strlen(*client_realm),
*client_realm,
strlen("krbtgt"),
"krbtgt",
strlen(*client_realm),
*client_realm,
NULL);
if (ret) if (ret)
goto out; goto out;
} }
@@ -384,7 +377,7 @@ krb5_get_init_creds_keytab(krb5_context context,
ret = krb5_kt_get_entry(context, ret = krb5_kt_get_entry(context,
keytab, keytab,
this_cred.server, this_cred.client,
0, 0,
KEYTYPE_DES, KEYTYPE_DES,
&kt_ent); &kt_ent);
@@ -402,7 +395,7 @@ krb5_get_init_creds_keytab(krb5_context context,
NULL, NULL,
&this_cred, &this_cred,
NULL /* &kdc_reply */); NULL /* &kdc_reply */);
ret = krb5_kt_free_entry(context, &kt_ent); krb5_kt_free_entry(context, &kt_ent);
if (ret) if (ret)
goto out; goto out;
free (pre_auth_types); free (pre_auth_types);