STABLE14-windows-afslogon-20060209

replace sizeof(opt) with sizeof(LogonOption_t)

add more debug statements

(cherry picked from commit 4b3c120e8e571f650e8274da553b1489cc34bd5e)

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index fb432eb556dc2ec81ad13556de3d16b88a40b120..bafc0adef4b5c8e26ab95a522e44494aa12d30af 100644 (file)
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -1051,7 +1051,7 @@ VOID AFS_Logoff_Event( PWLX_NOTIFICATION_INFO pInfo )
     RegCloseKey (NPKey);
 
     if (!LogoffPreserveTokens) {
-       ZeroMemory(&opt, sizeof(opt));
+       memset(&opt, 0, sizeof(LogonOptions_t));
 
        if (pInfo->UserName && pInfo->Domain) {
            char username[MAX_USERNAME_LENGTH] = "";
@@ -1146,13 +1146,15 @@ VOID AFS_Logon_Event( PWLX_NOTIFICATION_INFO pInfo )
 
     DebugEvent("AFS_Logon_Event Process ID: %d",GetCurrentProcessId());
 
-    ZeroMemory(&opt, sizeof(opt));
+    memset(&opt, 0, sizeof(LogonOptions_t));
 
     if (pInfo->UserName && pInfo->Domain) {
         char username[MAX_USERNAME_LENGTH] = "";
         char domain[MAX_DOMAIN_LENGTH] = "";
         size_t szlen = 0;
 
+       DebugEvent0("AFS_Logon_Event - pInfo UserName and Domain");
+
         StringCchLengthW(pInfo->UserName, MAX_USERNAME_LENGTH, &szlen);
         WideCharToMultiByte(CP_UTF8, 0, pInfo->UserName, szlen,
                             username, sizeof(username), NULL, NULL);
@@ -1161,14 +1163,25 @@ VOID AFS_Logon_Event( PWLX_NOTIFICATION_INFO pInfo )
         WideCharToMultiByte(CP_UTF8, 0, pInfo->Domain, szlen,
                             domain, sizeof(domain), NULL, NULL);
 
+       DebugEvent0("AFS_Logon_Event - Calling GetDomainLogonOptions");
         GetDomainLogonOptions(NULL, username, domain, &opt);
+    } else {
+       if (!pInfo->UserName)
+           DebugEvent0("AFS_Logon_Event - No pInfo->UserName");
+       if (!pInfo->Domain)
+           DebugEvent0("AFS_Logon_Event - No pInfo->Domain");
     }
 
+    DebugEvent("AFS_Logon_Event - opt.LogonOption = %lX opt.flags = %lX", 
+               opt.LogonOption, opt.flags);
+
     if (!ISLOGONINTEGRATED(opt.LogonOption) || !ISREMOTE(opt.flags)) {
-        DebugEvent("AFS_Logon_Event - Logon is not integrated or not remote");
+        DebugEvent0("AFS_Logon_Event - Logon is not integrated or not remote");
         goto done_logon_event;
     }
 
+    DebugEvent0("AFS_Logon_Event - Calling GetTokenInformation");
+
     if (!GetTokenInformation(pInfo->hToken, TokenUser, NULL, 0, &retLen))
     {
         if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) {