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

(krb5_free_principal): added `context' argument. Changed all callers.

Browse Source 
(krb5_sname_to_principal): new function


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@1436 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-03-16 17:16:06 +00:00
parent cae9390ca0
commit 710cc76dde
1 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/krb5/principal.c
View File

@@ -11,7 +11,8 @@ RCSID("$Id$");
/* Public principal handling functions */ /* Public principal handling functions */
void void
krb5_free_principal(krb5_principal p) krb5_free_principal(krb5_context context,
krb5_principal p)
{ {
krb5_principal_free(p); krb5_principal_free(p);
} }
@@ -337,12 +338,12 @@ krb5_copy_principal(krb5_context context,
return ENOMEM; return ENOMEM;
p->type = inprinc->type; p->type = inprinc->type;
if(krb5_data_copy(&p->realm, inprinc->realm.data, inprinc->realm.length)){ if(krb5_data_copy(&p->realm, inprinc->realm.data, inprinc->realm.length)){
krb5_free_principal(p); krb5_free_principal(context, p);
return ENOMEM; return ENOMEM;
} }
p->comp = ALLOC(inprinc->ncomp, krb5_data); p->comp = ALLOC(inprinc->ncomp, krb5_data);
if(!p->comp){ if(!p->comp){
krb5_free_principal(p); krb5_free_principal(context, p);
return ENOMEM; return ENOMEM;
} }
@@ -350,7 +351,7 @@ krb5_copy_principal(krb5_context context,
p->comp[i].length = 0; p->comp[i].length = 0;
if(krb5_data_copy(&p->comp[i], inprinc->comp[i].data, if(krb5_data_copy(&p->comp[i], inprinc->comp[i].data,
inprinc->comp[i].length)){ inprinc->comp[i].length)){
krb5_free_principal(p); krb5_free_principal(context, p);
return ENOMEM; return ENOMEM;
} }
p->ncomp = i+1; p->ncomp = i+1;
@@ -409,3 +410,25 @@ krb5_425_conv_principal(krb5_context context,
krb5_error_code
krb5_sname_to_principal (krb5_context context,
const char *hostname,
const char *sname,
int32_t type,
krb5_principal *ret_princ)
{
krb5_error_code ret;
char **r;
ret = krb5_get_host_realm (context, hostname, &r);
if (ret)
return ret;
return krb5_build_principal (context,
ret_princ,
strlen(r[0]),
r[0],
sname,
hostname,
0);
}