diff options
| author | Alexandra Ellwood <lxs@mit.edu> | 2004-07-15 17:45:04 +0000 |
|---|---|---|
| committer | Alexandra Ellwood <lxs@mit.edu> | 2004-07-15 17:45:04 +0000 |
| commit | 963fe7c8d9674743b1f848fb3fd2b7306b8ffe0b (patch) | |
| tree | 1b17a70acd1c14da4f3307c0e25293217f1c3452 /src/lib/krb4 | |
| parent | 79669ddb86c47f6f2cfaf6bd7105b448ed29de05 (diff) | |
| download | krb5-963fe7c8d9674743b1f848fb3fd2b7306b8ffe0b.tar.gz krb5-963fe7c8d9674743b1f848fb3fd2b7306b8ffe0b.tar.xz krb5-963fe7c8d9674743b1f848fb3fd2b7306b8ffe0b.zip | |
Remove use of client principal from krb5_context (default_ccprincipal) and default principal from v4 CCAPI glue code
ticket: 2634
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16602 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/lib/krb4')
| -rw-r--r-- | src/lib/krb4/CCache-glue.c | 48 | ||||
| -rw-r--r-- | src/lib/krb4/ChangeLog | 5 |
2 files changed, 11 insertions, 42 deletions
diff --git a/src/lib/krb4/CCache-glue.c b/src/lib/krb4/CCache-glue.c index 3a585377f..db00631f8 100644 --- a/src/lib/krb4/CCache-glue.c +++ b/src/lib/krb4/CCache-glue.c @@ -68,11 +68,7 @@ static void UpdateDefaultCache (void); /* * Name of the default cache */ -char* gDefaultCacheName = NULL; -char gDefaultName[ANAME_SZ]; -char gDefaultInstance[INST_SZ]; -char gDefaultRealm[REALM_SZ]; -Boolean gHaveDefaultPrincipal = false; +char* gDefaultCacheName = NULL; /* * Initialize credentials cache @@ -329,44 +325,13 @@ krb_get_cred ( if (strncmp (service, KRB_TICKET_GRANTING_TICKET, ANAME_SZ) == 0) { OSStatus err; char *cacheName; - KLPrincipal defaultPrincipal = nil; KLPrincipal outPrincipal; - if (gHaveDefaultPrincipal) { - err = KLCreatePrincipalFromTriplet (gDefaultName, gDefaultInstance, gDefaultRealm, &defaultPrincipal); - if (err != klNoErr) - defaultPrincipal = nil; - } - - err = __KLInternalAcquireInitialTicketsForCache (defaultPrincipal, NULL, TKT_FILE, - kerberosVersion_V4, &outPrincipal, &cacheName); - if (defaultPrincipal != nil) - KLDisposePrincipal (defaultPrincipal); - - if (err == noErr) { - char* newName = nil; - char* newInstance = nil; - char* newRealm = nil; - - gHaveDefaultPrincipal = false; - err = KLGetTripletFromPrincipal (outPrincipal, &newName, &newInstance, &newRealm); - if (err == noErr) { - // If this isn't a valid krb4 principal, don't store it or track the cache name - if ((strlen (newName) < ANAME_SZ) && (strlen (newInstance) < INST_SZ) && - (strlen (newRealm) < REALM_SZ)) { - strcpy (gDefaultName, newName); - strcpy (gDefaultInstance, newInstance); - strcpy (gDefaultRealm, newRealm); - krb_set_tkt_string (cacheName); // Tickets for the krb4 principal went here - - gHaveDefaultPrincipal = true; - } - - KLDisposeString (newName); - KLDisposeString (newInstance); - KLDisposeString (newRealm); - } - + err = __KLInternalAcquireInitialTicketsForCache (TKT_FILE, kerberosVersion_V4, NULL, + &outPrincipal, &cacheName); + + if (err == klNoErr) { + krb_set_tkt_string (cacheName); // Tickets for the krb4 principal went here KLDisposeString (cacheName); KLDisposePrincipal (outPrincipal); } else { @@ -498,7 +463,6 @@ krb_set_tkt_string ( gDefaultCacheName = malloc (strlen (val) + 1); if (gDefaultCacheName != NULL) strcpy (gDefaultCacheName, val); - gHaveDefaultPrincipal = false; } } diff --git a/src/lib/krb4/ChangeLog b/src/lib/krb4/ChangeLog index 7b865d367..41c321078 100644 --- a/src/lib/krb4/ChangeLog +++ b/src/lib/krb4/ChangeLog @@ -1,3 +1,8 @@ +2004-07-15 Alexandra Ellwood <lxs@mit.edu> + + * CCache-glue.c (krb_get_cred) + Removed default principal tracking. + 2004-07-14 Ken Raeburn <raeburn@mit.edu> * recvauth.c (krb_recvauth): Initialize cp and tmp_buf. Check |