From: Tom Yu <tlyu@mit.edu>
Date: Mon, 5 Dec 2011 23:43:28 +0000 (+0000)
Subject: pull up r25499 from trunk
X-Git-Tag: krb5-1.10-alpha2~8
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7330d47ff0f141104513ad0907a1114fbf1464cb;p=krb5.git

pull up r25499 from trunk

 ------------------------------------------------------------------------
 r25499 | hartmans | 2011-12-02 14:20:54 -0500 (Fri, 02 Dec 2011) | 7 lines

 ticket: 7037
 subject:  Use LsaDeregisterLogonProcess(), not CloseHandle()
 target_version: 1.10
 tags: pullup

 Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>

ticket: 7037
version_fixed: 1.10
status: resolved

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-10@25522 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/lib/krb5/ccache/cc_mslsa.c b/src/lib/krb5/ccache/cc_mslsa.c
index 9e9d27134..098ba29c6 100644
--- a/src/lib/krb5/ccache/cc_mslsa.c
+++ b/src/lib/krb5/ccache/cc_mslsa.c
@@ -668,7 +668,7 @@ does_retrieve_ticket_cache_ticket (void)
 
         pTicketRequest = (PKERB_RETRIEVE_TKT_REQUEST) LocalAlloc(LMEM_ZEROINIT, RequestSize);
         if (!pTicketRequest) {
-            CloseHandle(LogonHandle);
+            LsaDeregisterLogonProcess(LogonHandle);
             return FALSE;
         }
 
@@ -693,7 +693,7 @@ does_retrieve_ticket_cache_ticket (void)
         );
 
         LocalFree(pTicketRequest);
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
 
         if (FAILED(Status) || FAILED(SubStatus)) {
             if ( SubStatus == STATUS_NOT_SUPPORTED )
@@ -733,7 +733,7 @@ does_query_ticket_cache_ex2 (void)
 
         pCacheRequest = (PKERB_QUERY_TKT_CACHE_REQUEST) LocalAlloc(LMEM_ZEROINIT, RequestSize);
         if (!pCacheRequest) {
-            CloseHandle(LogonHandle);
+            LsaDeregisterLogonProcess(LogonHandle);
             return FALSE;
         }
 
@@ -751,7 +751,7 @@ does_query_ticket_cache_ex2 (void)
         );
 
         LocalFree(pCacheRequest);
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
 
         if (!(FAILED(Status) || FAILED(SubStatus))) {
             LsaFreeReturnBuffer(pCacheResponse);
@@ -2048,7 +2048,7 @@ krb5_lcc_resolve (krb5_context context, krb5_ccache *id, const char *residual)
 
     lid = (krb5_ccache) malloc(sizeof(struct _krb5_ccache));
     if (lid == NULL) {
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
         return KRB5_CC_NOMEM;
     }
 
@@ -2057,7 +2057,7 @@ krb5_lcc_resolve (krb5_context context, krb5_ccache *id, const char *residual)
     lid->data = (krb5_pointer) malloc(sizeof(krb5_lcc_data));
     if (lid->data == NULL) {
         free(lid);
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
         return KRB5_CC_NOMEM;
     }
 
@@ -2071,7 +2071,7 @@ krb5_lcc_resolve (krb5_context context, krb5_ccache *id, const char *residual)
     if (data->cc_name == NULL) {
         free(lid->data);
         free(lid);
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
         return KRB5_CC_NOMEM;
     }
     strcpy(data->cc_name, residual);
@@ -2093,7 +2093,7 @@ krb5_lcc_resolve (krb5_context context, krb5_ccache *id, const char *residual)
         free(data->cc_name);
         free(lid->data);
         free(lid);
-        CloseHandle(LogonHandle);
+        LsaDeregisterLogonProcess(LogonHandle);
         return KRB5_FCC_NOFILE;
     }
 
@@ -2168,7 +2168,7 @@ krb5_lcc_close(krb5_context context, krb5_ccache id)
         data = (krb5_lcc_data *) id->data;
 
         if (data) {
-            CloseHandle(data->LogonHandle);
+            LsaDeregisterLogonProcess(data->LogonHandle);
             free(data);
         }
         free(id);