From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Mon, 13 Jun 2005 15:30:42 +0000 (+0000)
Subject: windows-logon-20050613
X-Git-Tag: openafs-devel-1_5_0~506
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=be485c959856311853303f5633687adb1efc5109;p=packages%2Fo%2Fopenafs.git

windows-logon-20050613


fix the return value of IsServiceStartPending.

use IsServiceRunning and IsServiceStartPending in the while loop
---

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index 724231e17..d955e6c2d 100644
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -279,7 +279,7 @@ BOOL IsServiceStartPending (void)
         CloseServiceHandle (hManager);
     }
     DebugEvent("AFS AfsLogon - Test Service Start Pending","Return Code[%x] ?Start Pending[%d]",Status.dwCurrentState,(Status.dwCurrentState == SERVICE_START_PENDING));
-    return (Status.dwCurrentState == SERVICE_RUNNING);
+    return (Status.dwCurrentState == SERVICE_START_PENDING);
 }   
 
 /* LOOKUPKEYCHAIN: macro to look up the value in the list of keys in order until it's found
@@ -781,7 +781,7 @@ DWORD APIENTRY NPLogonNotify(
     }
 
     /* loop until AFS is started. */
-    while (afsWillAutoStart) {
+    while (IsServiceRunning() || IsServiceStartPending()) {
         DebugEvent("while(autostart) LogonOption[%x], Service AutoStart[%d]",
                     opt.LogonOption,afsWillAutoStart);