[28897] in CVS-changelog-for-Kerberos-V5
krb5 commit [krb5-1.13]: Rename cc_mslsa.c routines to avoid OS
daemon@ATHENA.MIT.EDU (Tom Yu)
Wed May 13 17:06:17 2015
Date: Wed, 13 May 2015 17:06:01 -0400
From: Tom Yu <tlyu@mit.edu>
Message-Id: <201505132106.t4DL613Q005076@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/db13963e400fddb35a1bddf52d6a69ad93945be3
commit db13963e400fddb35a1bddf52d6a69ad93945be3
Author: Ben Kaduk <kaduk@mit.edu>
Date: Wed Aug 13 17:48:08 2014 -0400
Rename cc_mslsa.c routines to avoid OS versions
We don't care about XP versus non-XP; just indicate which
revision of the data type is being used.
Standardize on the lowercase 'x' in "Ex", for both the "Ex" and
"Ex2" forms.
While here, adjust the function definition prototypes to match
current style.
(cherry picked from commit bbf946566b32dcf2f9a718b28acd948eeb53ade4)
ticket: 7989
version_fixed: 1.13.3
src/lib/krb5/ccache/cc_mslsa.c | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index cb4fdc1..229fa96 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -649,8 +649,8 @@ PurgeAllTickets(HANDLE LogonHandle, ULONG PackageId)
}
static BOOL
-PurgeTicketXP( HANDLE LogonHandle, ULONG PackageId,
- krb5_context context, krb5_flags flags, krb5_creds *cred)
+PurgeTicketEx(HANDLE LogonHandle, ULONG PackageId,
+ krb5_context context, krb5_flags flags, krb5_creds *cred)
{
NTSTATUS Status = 0;
NTSTATUS SubStatus = 0;
@@ -1182,8 +1182,8 @@ cleanup:
}
static BOOL
-GetQueryTktCacheResponseXP( HANDLE LogonHandle, ULONG PackageId,
- PKERB_QUERY_TKT_CACHE_EX_RESPONSE * ppResponse)
+GetQueryTktCacheResponseEx(HANDLE LogonHandle, ULONG PackageId,
+ PKERB_QUERY_TKT_CACHE_EX_RESPONSE * ppResponse)
{
NTSTATUS Status = 0;
NTSTATUS SubStatus = 0;
@@ -1215,8 +1215,8 @@ GetQueryTktCacheResponseXP( HANDLE LogonHandle, ULONG PackageId,
}
static BOOL
-GetQueryTktCacheResponseEX2( HANDLE LogonHandle, ULONG PackageId,
- PKERB_QUERY_TKT_CACHE_EX2_RESPONSE * ppResponse)
+GetQueryTktCacheResponseEx2(HANDLE LogonHandle, ULONG PackageId,
+ PKERB_QUERY_TKT_CACHE_EX2_RESPONSE * ppResponse)
{
NTSTATUS Status = 0;
NTSTATUS SubStatus = 0;
@@ -1297,8 +1297,9 @@ GetMSCacheTicketFromMITCred( HANDLE LogonHandle, ULONG PackageId,
}
static BOOL
-GetMSCacheTicketFromCacheInfoXP( HANDLE LogonHandle, ULONG PackageId,
- PKERB_TICKET_CACHE_INFO_EX tktinfo, PKERB_EXTERNAL_TICKET *ticket)
+GetMSCacheTicketFromCacheInfoEx(HANDLE LogonHandle, ULONG PackageId,
+ PKERB_TICKET_CACHE_INFO_EX tktinfo,
+ PKERB_EXTERNAL_TICKET *ticket)
{
NTSTATUS Status = 0;
NTSTATUS SubStatus = 0;
@@ -1361,8 +1362,9 @@ GetMSCacheTicketFromCacheInfoXP( HANDLE LogonHandle, ULONG PackageId,
}
static BOOL
-GetMSCacheTicketFromCacheInfoEX2( HANDLE LogonHandle, ULONG PackageId,
- PKERB_TICKET_CACHE_INFO_EX2 tktinfo, PKERB_EXTERNAL_TICKET *ticket)
+GetMSCacheTicketFromCacheInfoEx2(HANDLE LogonHandle, ULONG PackageId,
+ PKERB_TICKET_CACHE_INFO_EX2 tktinfo,
+ PKERB_EXTERNAL_TICKET *ticket)
{
NTSTATUS Status = 0;
NTSTATUS SubStatus = 0;
@@ -1705,14 +1707,15 @@ krb5_lcc_start_seq_get(krb5_context context, krb5_ccache id, krb5_cc_cursor *cur
}
if ( does_query_ticket_cache_ex2() ) {
- if ( !GetQueryTktCacheResponseEX2(data->LogonHandle, data->PackageId, &lcursor->response.ex2) ) {
+ if (!GetQueryTktCacheResponseEx2(data->LogonHandle, data->PackageId,
+ &lcursor->response.ex2)) {
LsaFreeReturnBuffer(lcursor->mstgt);
free(lcursor);
*cursor = 0;
return KRB5_FCC_INTERNAL;
}
} else
- if (!GetQueryTktCacheResponseXP(data->LogonHandle, data->PackageId,
+ if (!GetQueryTktCacheResponseEx(data->LogonHandle, data->PackageId,
&lcursor->response.xp)) {
LsaFreeReturnBuffer(lcursor->mstgt);
free(lcursor);
@@ -1774,7 +1777,8 @@ next_cred:
}
return KRB5_OK;
} else {
- if (!GetMSCacheTicketFromCacheInfoEX2(data->LogonHandle, data->PackageId,
+ if (!GetMSCacheTicketFromCacheInfoEx2(data->LogonHandle,
+ data->PackageId,
&lcursor->response.ex2->Tickets[lcursor->index++],&msticket)) {
retval = KRB5_FCC_INTERNAL;
goto next_cred;
@@ -1793,7 +1797,7 @@ next_cred:
}
}
- if (!GetMSCacheTicketFromCacheInfoXP(data->LogonHandle,
+ if (!GetMSCacheTicketFromCacheInfoEx(data->LogonHandle,
data->PackageId,
&lcursor->response.xp->Tickets[lcursor->index++],
&msticket)) {
@@ -1986,14 +1990,14 @@ krb5_lcc_retrieve(krb5_context context, krb5_ccache id, krb5_flags whichfields,
* cache contents until we find the matching service ticket.
*/
- if (!GetQueryTktCacheResponseXP(data->LogonHandle, data->PackageId,
+ if (!GetQueryTktCacheResponseEx(data->LogonHandle, data->PackageId,
&pResponse)) {
kret = KRB5_FCC_INTERNAL;
goto cleanup;
}
for (i = 0; i < pResponse->CountOfTickets; i++) {
- if (!GetMSCacheTicketFromCacheInfoXP(data->LogonHandle,
+ if (!GetMSCacheTicketFromCacheInfoEx(data->LogonHandle,
data->PackageId,
&pResponse->Tickets[i], &mstmp)) {
continue;
@@ -2104,7 +2108,7 @@ krb5_lcc_remove_cred(krb5_context context, krb5_ccache id, krb5_flags flags,
{
krb5_lcc_data *data = (krb5_lcc_data *)id->data;
- if (PurgeTicketXP(data->LogonHandle, data->PackageId, context, flags,
+ if (PurgeTicketEx(data->LogonHandle, data->PackageId, context, flags,
creds))
return KRB5_OK;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
