STABLE14-windows-afslogon-20050610

replace wfhile(TRUE) with while(afsAutoStart)

(cherry picked from commit a70bec720087aab99909861c346cc59d14107278)

diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index 5f60b10c733f655944cbc486030d50f3a99f2461..724231e179365d4efbad833c9a90df067fda171d 100644 (file)
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -781,8 +781,8 @@ DWORD APIENTRY NPLogonNotify(
     }
 
     /* loop until AFS is started. */
-    while (TRUE) {
-        DebugEvent("while(TRUE) LogonOption[%x], Service AutoStart[%d]",
+    while (afsWillAutoStart) {
+        DebugEvent("while(autostart) LogonOption[%x], Service AutoStart[%d]",
                     opt.LogonOption,afsWillAutoStart);
 
         if (ISADREALM(opt.flags)) {
@@ -847,14 +847,14 @@ DWORD APIENTRY NPLogonNotify(
             * client is set to autostart (and therefore it makes sense for
             * us to wait for it to start) then sleep a while and try again. 
             * If the error was something else, then give up. */
-            if (code != KTC_NOCM && code != KTC_NOCMRPC || !afsWillAutoStart)
+            if (code != KTC_NOCM && code != KTC_NOCMRPC)
                 break;
         }
         else {  
             /*JUST check to see if its running*/
             if (IsServiceRunning())
                 break;
-            if (afsWillAutoStart && !IsServiceStartPending()) {
+            if (!IsServiceStartPending()) {
                 code = KTC_NOCMRPC;
                 reason = "AFS Service start failed";
                 break;