]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Windows: afslogon NPLogonNotify exit on KTC_NOCM
authorJeffrey Altman <jaltman@your-file-system.com>
Sun, 28 Aug 2011 16:02:14 +0000 (12:02 -0400)
committerJeffrey Altman <jaltman@openafs.org>
Tue, 30 Aug 2011 13:55:17 +0000 (06:55 -0700)
If the service has started but is not responding to pioctls,
permit the NPLogonNotify() routine to exit.

Reviewed-on: http://gerrit.openafs.org/5315
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
(cherry picked from commit 971a103cd088ddbaf227d562fc64f8c728bbc235)

Change-Id: I9cba8296271609220de2d0a7ecbb7721e4672077
Reviewed-on: http://gerrit.openafs.org/5320
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
src/WINNT/afsd/afslogon.c

index 9b09d346c809fef00387769e3e51f3d5a7352450..9ab15516607d32e37f5a8e5953a52fd3c1022686 100644 (file)
@@ -937,9 +937,9 @@ DWORD APIENTRY NPLogonNotify(
             DebugEvent0("Unable to obtain Root Cell");
             code = KTC_NOCELL;
             reason = "unknown cell";
-            code=0;
         } else {
             DebugEvent("Default cell is %s", cell);
+            code = 0;
         }
 
         /* We get the user's home directory path, if applicable, though we can't lookup the
@@ -964,7 +964,8 @@ DWORD APIENTRY NPLogonNotify(
             Sleep(10);
         }
 
-       while (IsServiceRunning()) {
+        while (IsServiceRunning() && code != KTC_NOCM && code != KTC_NOCMRPC && code != KTC_NOCELL) {
+
             DebugEvent("while(autostart) LogonOption[%x], Service AutoStart[%d]",
                        opt.LogonOption,afsWillAutoStart);