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

(krb5_524_conv_principal): comment-ize, and simplify string copying

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@8230 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2000-05-15 00:56:57 +00:00
parent 9988fa7dd6
commit 7ce6bdbb0a
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/krb5/principal.c
View File

@@ -821,6 +821,13 @@ name_convert(krb5_context context, const char *name, const char *realm,
return -1; return -1;
} }
/*
* convert the v5 principal in `principal' into a v4 corresponding one
* in `name, instance, realm'
* this is limited interface since there's no length given for these
* three parameters. They have to be 40 bytes each (ANAME_SZ).
*/
krb5_error_code krb5_error_code
krb5_524_conv_principal(krb5_context context, krb5_524_conv_principal(krb5_context context,
const krb5_principal principal, const krb5_principal principal,
@@ -831,6 +838,7 @@ krb5_524_conv_principal(krb5_context context,
const char *n, *i, *r; const char *n, *i, *r;
char tmpinst[40]; char tmpinst[40];
int type = princ_type(principal); int type = princ_type(principal);
const int aname_sz = 40;
r = principal->realm; r = principal->realm;
@@ -866,15 +874,12 @@ krb5_524_conv_principal(krb5_context context,
i = tmpinst; i = tmpinst;
} }
if(strlen(r) >= 40) if (strlcpy (name, n, aname_sz) >= aname_sz)
return KRB5_PARSE_MALFORMED; return KRB5_PARSE_MALFORMED;
if(strlen(n) >= 40) if (strlcpy (instance, r, aname_sz) >= aname_sz)
return KRB5_PARSE_MALFORMED; return KRB5_PARSE_MALFORMED;
if(strlen(i) >= 40) if (strlcpy (realm, r, aname_sz) >= aname_sz)
return KRB5_PARSE_MALFORMED; return KRB5_PARSE_MALFORMED;
strcpy(realm, r);
strcpy(name, n);
strcpy(instance, i);
return 0; return 0;
} }