From: Joakim Fallsjö <fallsjo@stacken.kth.se>
Date: Fri, 6 Jun 2003 22:12:09 +0000 (+0000)
Subject: STABLE12-winnt-give-better-debugging-20030606
X-Git-Tag: openafs-stable-1_2_10~42
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=9bd130da1c89db36693516087b5d3a5d4175a042;p=packages%2Fo%2Fopenafs.git

STABLE12-winnt-give-better-debugging-20030606


offer better messages in certain cases


(cherry picked from commit b609b807d24d336dfe8a0939249001dc8874c69a)
---

diff --git a/src/WINNT/afsd/afsd_init.c b/src/WINNT/afsd/afsd_init.c
index a09e4c144..84d6a8504 100644
--- a/src/WINNT/afsd/afsd_init.c
+++ b/src/WINNT/afsd/afsd_init.c
@@ -416,7 +416,10 @@ int afsd_InitCM(char **reasonP)
 	}
 	else {
 	  cm_dnsEnabled = 1;   /* default on */
+	  afsi_log("Default to use DNS to find AFS cell servers");
 	}
+#else /* AFS_AFSDB_ENV */
+	afsi_log("AFS not built with DNS support to find AFS cell servers");
 #endif /* AFS_AFSDB_ENV */
 
 #ifdef AFS_FREELANCE_CLIENT
diff --git a/src/WINNT/afsd/afslogon.c b/src/WINNT/afsd/afslogon.c
index 8ad61f28c..ff671c1b9 100644
--- a/src/WINNT/afsd/afslogon.c
+++ b/src/WINNT/afsd/afslogon.c
@@ -320,6 +320,7 @@ DWORD APIENTRY NPLogonNotify(
 	LPWSTR *lpLogonScript)
 {
 	char uname[256];
+	char *ctemp;
 	char password[256];
 	char cell[256];
 	MSV1_0_INTERACTIVE_LOGON *IL;
@@ -347,6 +348,10 @@ DWORD APIENTRY NPLogonNotify(
 	wcstombs(uname, IL->UserName.Buffer, 256);
 	wcstombs(password, IL->Password.Buffer, 256);
 
+	/* Make sure AD-DOMANS sent from login that is sent to us is striped */
+        ctemp = strchr(uname, '@');
+        if (ctemp) *ctemp = 0;
+
 	(void) RegOpenKeyEx(HKEY_LOCAL_MACHINE, REG_CLIENT_PARMS_KEY,
 		    0, KEY_QUERY_VALUE, &NPKey);
 	LSPsize=sizeof(TraceOption);
@@ -435,6 +440,7 @@ DWORD APIENTRY NPLogonNotify(
                  * mode or the failSilently flag is set, otherwise let the
                  * user know we failed and give them a chance to try again. */
         if (retryInterval <= 0) {
+	     reason = "AFS not running";
              if (!interactive || failSilently)
                  break;
 			flag = MessageBox(hwndOwner,