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)
committerDerrick Brashear <shadow@dementix.org>
Mon, 29 Aug 2011 20:26:53 +0000 (13:26 -0700)
If the service has started but is not responding to pioctls,
permit the NPLogonNotify() routine to exit.

Change-Id: I1ed4ac7a7fed5d86d607ecfd5e027f62ec26a82f
Reviewed-on: http://gerrit.openafs.org/5315
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>

src/WINNT/afsd/afslogon.c

index 34b21b3..7f01851 100644 (file)
@@ -949,9 +949,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
@@ -976,7 +976,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);