From: Jeffrey Altman <jaltman@secure-endpoints.com>
Date: Fri, 10 Jun 2005 21:55:12 +0000 (+0000)
Subject: STABLE14-windows-afslogon-20050610
X-Git-Tag: openafs-devel-1_3_85~64
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=e24ece56449ba919ad46cdf7b48984f2ed338e6e;p=packages%2Fo%2Fopenafs.git

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 5f60b10c7..724231e17 100644
--- 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;