summaryrefslogtreecommitdiffstats
path: root/src/kim
diff options
context:
space:
mode:
authorAlexandra Ellwood <lxs@mit.edu>2008-10-17 18:34:51 +0000
committerAlexandra Ellwood <lxs@mit.edu>2008-10-17 18:34:51 +0000
commitea4de1bb8ad087485b4eee6a1c03db826e1e9f03 (patch)
treeea5c198ae0a98dc1094f2e8464fbb589a8e3fc93 /src/kim
parent57b5aca9566ca86863377c16e6d70d1f360efb43 (diff)
downloadkrb5-ea4de1bb8ad087485b4eee6a1c03db826e1e9f03.tar.gz
krb5-ea4de1bb8ad087485b4eee6a1c03db826e1e9f03.tar.xz
krb5-ea4de1bb8ad087485b4eee6a1c03db826e1e9f03.zip
KLCreatePrincipalFromTriplet should work with empty instance
Fixed bug where shim layer was calling kim_identity_create_from_components incorrectly in this case. ticket: new git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20887 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kim')
-rw-r--r--src/kim/lib/mac/KerberosLogin.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/src/kim/lib/mac/KerberosLogin.c b/src/kim/lib/mac/KerberosLogin.c
index 47bb14253..de05e57dd 100644
--- a/src/kim/lib/mac/KerberosLogin.c
+++ b/src/kim/lib/mac/KerberosLogin.c
@@ -1446,11 +1446,18 @@ KLStatus KLCreatePrincipalFromTriplet (const char *inName,
const char *inRealm,
KLPrincipal *outPrincipal)
{
- return kl_check_error (kim_identity_create_from_components (outPrincipal,
- inRealm,
- inName,
- inInstance,
- NULL));
+ if (inInstance && strlen (inInstance) > 0) {
+ return kl_check_error (kim_identity_create_from_components (outPrincipal,
+ inRealm,
+ inName,
+ inInstance,
+ NULL));
+ } else {
+ return kl_check_error (kim_identity_create_from_components (outPrincipal,
+ inRealm,
+ inName,
+ NULL));
+ }
}
/* ------------------------------------------------------------------------ */