Index: openafs/src/WINNT/afsd/afslogon.c diff -c openafs/src/WINNT/afsd/afslogon.c:1.24.2.17 openafs/src/WINNT/afsd/afslogon.c:1.24.2.20 *** openafs/src/WINNT/afsd/afslogon.c:1.24.2.17 Thu Jan 26 01:09:47 2006 --- openafs/src/WINNT/afsd/afslogon.c Thu Feb 9 10:29:41 2006 *************** *** 410,416 **** if(ISHIGHSECURITY(opt->LogonOption)) { opt->smbName = malloc( MAXRANDOMNAMELEN ); GenRandomName(opt->smbName); ! } else { /* username and domain for logon session is not necessarily the same as username and domain passed into network provider. */ PSECURITY_LOGON_SESSION_DATA plsd; --- 410,416 ---- if(ISHIGHSECURITY(opt->LogonOption)) { opt->smbName = malloc( MAXRANDOMNAMELEN ); GenRandomName(opt->smbName); ! } else if (lpLogonId) { /* username and domain for logon session is not necessarily the same as username and domain passed into network provider. */ PSECURITY_LOGON_SESSION_DATA plsd; *************** *** 447,452 **** --- 447,467 ---- bad_strings: LsaFreeReturnBuffer(plsd); + } else { + size_t len; + + DebugEvent("No LUID given. Constructing username using [%s] and [%s]", + username, domain); + + len = strlen(username) + strlen(domain) + 2; + + opt->smbName = malloc(len); + + StringCbCopy(opt->smbName, len, username); + StringCbCat(opt->smbName, len, "\\"); + StringCbCat(opt->smbName, len, domain); + + strlwr(opt->smbName); } DebugEvent("Looking up logon script"); *************** *** 578,584 **** DebugEvent("Found TheseCells [%s]", thesecells); opt->theseCells = thesecells; ! doneTheseCells:; } cleanup: --- 593,600 ---- DebugEvent("Found TheseCells [%s]", thesecells); opt->theseCells = thesecells; ! doneTheseCells: ! ; } cleanup: *************** *** 755,761 **** code = GT_PW_NULL; reason = "zero length password is illegal"; code=0; ! } /* Get cell name if doing integrated logon. We might overwrite this if we are logging into an AD realm and we find out that --- 771,777 ---- code = GT_PW_NULL; reason = "zero length password is illegal"; code=0; ! } /* Get cell name if doing integrated logon. We might overwrite this if we are logging into an AD realm and we find out that *************** *** 781,889 **** } /* loop until AFS is started. */ ! while (IsServiceRunning() || IsServiceStartPending()) { ! DebugEvent("while(autostart) LogonOption[%x], Service AutoStart[%d]", ! opt.LogonOption,afsWillAutoStart); ! ! if (ISADREALM(opt.flags)) { ! code = GetFileCellName(homePath,cell,256); ! if (!code) { ! DebugEvent("profile path [%s] is in cell [%s]",homePath,cell); ! } ! /* Don't bail out if GetFileCellName failed. ! * The home dir may not be in AFS after all. ! */ ! } else ! code=0; ! ! /* if Integrated Logon */ ! if (ISLOGONINTEGRATED(opt.LogonOption)) ! { ! if ( KFW_is_available() ) { ! code = KFW_AFS_get_cred(uname, cell, password, 0, opt.smbName, &reason); ! DebugEvent("KFW_AFS_get_cred uname=[%s] smbname=[%s] cell=[%s] code=[%d]", ! uname,opt.smbName,cell,code); ! if (code == 0 && opt.theseCells) { ! char * principal, *p; ! ! principal = (char *)malloc(strlen(uname) + strlen(cell) + 2); ! if ( principal ) { ! strcpy(principal, uname); ! p = principal + strlen(uname); ! *p++ = '@'; ! strcpy(p, cell); ! for ( ;*p; p++) { ! *p = toupper(*p); ! } ! ! p = opt.theseCells; ! while ( *p ) { ! code2 = KFW_AFS_get_cred(principal, p, 0, 0, opt.smbName, &reason); ! DebugEvent("KFW_AFS_get_cred uname=[%s] smbname=[%s] cell=[%s] code=[%d]", ! principal,opt.smbName,p,code2); ! p += strlen(p) + 1; ! } ! ! free(principal); ! } ! } ! } else { ! code = ka_UserAuthenticateGeneral2(KA_USERAUTH_VERSION+KA_USERAUTH_AUTHENT_LOGON, ! uname, "", cell, password, opt.smbName, 0, &pw_exp, 0, ! &reason); ! DebugEvent("AFS AfsLogon - (INTEGRATED only)ka_UserAuthenticateGeneral2 Code[%x] uname[%s] smbname=[%s] Cell[%s] PwExp=[%d] Reason=[%s]", ! code,uname,opt.smbName,cell,pw_exp,reason?reason:""); ! } ! if ( code && code != KTC_NOCM && code != KTC_NOCMRPC && !lowercased_name ) { ! for ( ctemp = uname; *ctemp ; ctemp++) { ! *ctemp = tolower(*ctemp); ! } ! lowercased_name = TRUE; ! goto sleeping; ! } ! ! /* is service started yet?*/ ! ! /* If we've failed because the client isn't running yet and the ! * 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) ! break; ! } ! else { ! /*JUST check to see if its running*/ ! if (IsServiceRunning()) ! break; ! if (!IsServiceStartPending()) { ! code = KTC_NOCMRPC; ! reason = "AFS Service start failed"; ! break; ! } ! } ! ! /* If the retry interval has expired and we still aren't ! * logged in, then just give up if we are not in interactive ! * 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 || opt.failSilently) ! break; ! flag = MessageBox(hwndOwner, ! "AFS is still starting. Retry?", ! "AFS Logon", ! MB_ICONQUESTION | MB_RETRYCANCEL); ! if (flag == IDCANCEL) ! break; ! ! /* Wait just a little while and try again */ ! retryInterval = opt.retryInterval; ! } ! ! sleeping: ! Sleep(sleepInterval * 1000); ! retryInterval -= sleepInterval; } DebugEvent("while loop exited"); --- 797,914 ---- } /* loop until AFS is started. */ ! if (afsWillAutoStart) { ! while (IsServiceRunning() || IsServiceStartPending()) { ! DebugEvent("while(autostart) LogonOption[%x], Service AutoStart[%d]", ! opt.LogonOption,afsWillAutoStart); ! ! if (ISADREALM(opt.flags)) { ! code = GetFileCellName(homePath,cell,256); ! if (!code) { ! DebugEvent("profile path [%s] is in cell [%s]",homePath,cell); ! } ! /* Don't bail out if GetFileCellName failed. ! * The home dir may not be in AFS after all. ! */ ! } else ! code=0; ! ! /* if Integrated Logon */ ! if (ISLOGONINTEGRATED(opt.LogonOption)) ! { ! if ( KFW_is_available() ) { ! code = KFW_AFS_get_cred(uname, cell, password, 0, opt.smbName, &reason); ! DebugEvent("KFW_AFS_get_cred uname=[%s] smbname=[%s] cell=[%s] code=[%d]", ! uname,opt.smbName,cell,code); ! if (code == 0 && opt.theseCells) { ! char * principal, *p; ! size_t len, tlen; ! ! StringCchLength(cell, MAX_DOMAIN_LENGTH, &tlen); ! len = tlen; ! StringCchLength(uname, MAX_USERNAME_LENGTH, &tlen); ! len += tlen + 2; ! ! /* tlen is now the length of uname in characters */ ! principal = (char *)malloc(len * sizeof(char)); ! if ( principal ) { ! StringCchCopy(principal, len, uname); ! p = principal + tlen; ! *p++ = '@'; ! StringCchCopy(p, len - tlen -1, cell); ! for ( ;*p; p++) { ! *p = toupper(*p); ! } ! ! p = opt.theseCells; ! while ( *p ) { ! code2 = KFW_AFS_get_cred(principal, p, 0, 0, opt.smbName, &reason); ! DebugEvent("KFW_AFS_get_cred uname=[%s] smbname=[%s] cell=[%s] code=[%d]", ! principal,opt.smbName,p,code2); ! p += strlen(p) + 1; ! } ! ! free(principal); ! } ! } ! } else { ! code = ka_UserAuthenticateGeneral2(KA_USERAUTH_VERSION+KA_USERAUTH_AUTHENT_LOGON, ! uname, "", cell, password, opt.smbName, 0, &pw_exp, 0, ! &reason); ! DebugEvent("AFS AfsLogon - (INTEGRATED only)ka_UserAuthenticateGeneral2 Code[%x] uname[%s] smbname=[%s] Cell[%s] PwExp=[%d] Reason=[%s]", ! code,uname,opt.smbName,cell,pw_exp,reason?reason:""); ! } ! if ( code && code != KTC_NOCM && code != KTC_NOCMRPC && !lowercased_name ) { ! for ( ctemp = uname; *ctemp ; ctemp++) { ! *ctemp = tolower(*ctemp); ! } ! lowercased_name = TRUE; ! goto sleeping; ! } ! ! /* is service started yet?*/ ! ! /* If we've failed because the client isn't running yet and the ! * 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) ! break; ! } ! else { ! /*JUST check to see if its running*/ ! if (IsServiceRunning()) ! break; ! if (!IsServiceStartPending()) { ! code = KTC_NOCMRPC; ! reason = "AFS Service start failed"; ! break; ! } ! } ! ! /* If the retry interval has expired and we still aren't ! * logged in, then just give up if we are not in interactive ! * 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 || opt.failSilently) ! break; ! flag = MessageBox(hwndOwner, ! "AFS is still starting. Retry?", ! "AFS Logon", ! MB_ICONQUESTION | MB_RETRYCANCEL); ! if (flag == IDCANCEL) ! break; ! ! /* Wait just a little while and try again */ ! retryInterval = opt.retryInterval; ! } ! ! sleeping: ! Sleep(sleepInterval * 1000); ! retryInterval -= sleepInterval; ! } } DebugEvent("while loop exited"); *************** *** 1011,1016 **** --- 1036,1042 ---- DWORD LSPtype, LSPsize; HKEY NPKey; DWORD LogoffPreserveTokens = 0; + LogonOptions_t opt; /* Make sure the AFS Libraries are initialized */ AfsLogonInit(); *************** *** 1024,1070 **** &LSPtype, (LPBYTE)&LogoffPreserveTokens, &LSPsize); RegCloseKey (NPKey); ! if (LogoffPreserveTokens) { ! if (!GetTokenInformation(pInfo->hToken, TokenUser, NULL, 0, &retLen)) ! { ! if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) { ! tokenUser = (PTOKEN_USER) LocalAlloc(LPTR, retLen); ! ! if (!GetTokenInformation(pInfo->hToken, TokenUser, tokenUser, retLen, &retLen)) ! { ! DebugEvent("AFS_Logoff_Event - GetTokenInformation failed: GLE = %lX", GetLastError()); ! } ! } ! } ! /* We can't use pInfo->Domain for the domain since in the cross realm case ! * this is source domain and not the destination domain. ! */ ! if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) { ! WCHAR Domain[64]=L""; ! GetLocalShortDomain(Domain, sizeof(Domain)); ! if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, Domain)) { ! if (NetUserGetProfilePath(pInfo->Domain, pInfo->UserName, profileDir, len)) ! GetUserProfileDirectory(pInfo->hToken, profileDir, &len); ! } ! } ! if (strlen(profileDir)) { ! DebugEvent("AFS_Logoff_Event - Profile Directory: %s", profileDir); ! if (!IsPathInAfs(profileDir)) { ! if (code = ktc_ForgetAllTokens()) ! DebugEvent("AFS_Logoff_Event - ForgetAllTokens failed [%lX]",code); ! else ! DebugEvent0("AFS_Logoff_Event - ForgetAllTokens succeeded"); ! } else { ! DebugEvent0("AFS_Logoff_Event - Tokens left in place; profile in AFS"); ! } ! } else { ! DebugEvent0("AFS_Logoff_Event - Unable to load profile"); ! } ! if ( tokenUser ) ! LocalFree(tokenUser); } DebugEvent0("AFS_Logoff_Event - End"); --- 1050,1124 ---- &LSPtype, (LPBYTE)&LogoffPreserveTokens, &LSPsize); RegCloseKey (NPKey); ! if (!LogoffPreserveTokens) { ! memset(&opt, 0, sizeof(LogonOptions_t)); ! if (pInfo->UserName && pInfo->Domain) { ! char username[MAX_USERNAME_LENGTH] = ""; ! char domain[MAX_DOMAIN_LENGTH] = ""; ! size_t szlen = 0; ! ! StringCchLengthW(pInfo->UserName, MAX_USERNAME_LENGTH, &szlen); ! WideCharToMultiByte(CP_UTF8, 0, pInfo->UserName, szlen, ! username, sizeof(username), NULL, NULL); ! ! StringCchLengthW(pInfo->Domain, MAX_DOMAIN_LENGTH, &szlen); ! WideCharToMultiByte(CP_UTF8, 0, pInfo->Domain, szlen, ! domain, sizeof(domain), NULL, NULL); ! GetDomainLogonOptions(NULL, username, domain, &opt); ! } ! if (ISREMOTE(opt.flags)) { ! if (!GetTokenInformation(pInfo->hToken, TokenUser, NULL, 0, &retLen)) ! { ! if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) { ! tokenUser = (PTOKEN_USER) LocalAlloc(LPTR, retLen); ! ! if (!GetTokenInformation(pInfo->hToken, TokenUser, tokenUser, retLen, &retLen)) ! { ! DebugEvent("AFS_Logoff_Event - GetTokenInformation failed: GLE = %lX", GetLastError()); ! } ! } ! } ! ! /* We can't use pInfo->Domain for the domain since in the cross realm case ! * this is source domain and not the destination domain. ! */ ! if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, pInfo->Domain)) { ! WCHAR Domain[64]=L""; ! GetLocalShortDomain(Domain, sizeof(Domain)); ! if (QueryAdHomePathFromSid( profileDir, sizeof(profileDir), tokenUser->User.Sid, Domain)) { ! if (NetUserGetProfilePath(pInfo->Domain, pInfo->UserName, profileDir, len)) ! GetUserProfileDirectory(pInfo->hToken, profileDir, &len); ! } ! } ! ! if (strlen(profileDir)) { ! DebugEvent("AFS_Logoff_Event - Profile Directory: %s", profileDir); ! if (!IsPathInAfs(profileDir)) { ! if (code = ktc_ForgetAllTokens()) ! DebugEvent("AFS_Logoff_Event - ForgetAllTokens failed [%lX]",code); ! else ! DebugEvent0("AFS_Logoff_Event - ForgetAllTokens succeeded"); ! } else { ! DebugEvent0("AFS_Logoff_Event - Tokens left in place; profile in AFS"); ! } ! } else { ! DebugEvent0("AFS_Logoff_Event - Unable to load profile"); ! } ! ! if ( tokenUser ) ! LocalFree(tokenUser); ! } else { ! DebugEvent0("AFS_Logoff_Event - Local Logon"); ! if (code = ktc_ForgetAllTokens()) ! DebugEvent("AFS_Logoff_Event - ForgetAllTokens failed [%lX]",code); ! else ! DebugEvent0("AFS_Logoff_Event - ForgetAllTokens succeeded"); ! } ! } else { ! DebugEvent0("AFS_Logoff_Event - Preserving Tokens"); } DebugEvent0("AFS_Logoff_Event - End"); *************** *** 1083,1088 **** --- 1137,1143 ---- NETRESOURCE nr; DWORD res; DWORD dwSize; + LogonOptions_t opt; /* Make sure the AFS Libraries are initialized */ AfsLogonInit(); *************** *** 1091,1096 **** --- 1146,1187 ---- DebugEvent("AFS_Logon_Event Process ID: %d",GetCurrentProcessId()); + memset(&opt, 0, sizeof(LogonOptions_t)); + + if (pInfo->UserName && pInfo->Domain) { + char username[MAX_USERNAME_LENGTH] = ""; + char domain[MAX_DOMAIN_LENGTH] = ""; + size_t szlen = 0; + + DebugEvent0("AFS_Logon_Event - pInfo UserName and Domain"); + + StringCchLengthW(pInfo->UserName, MAX_USERNAME_LENGTH, &szlen); + WideCharToMultiByte(CP_UTF8, 0, pInfo->UserName, szlen, + username, sizeof(username), NULL, NULL); + + StringCchLengthW(pInfo->Domain, MAX_DOMAIN_LENGTH, &szlen); + WideCharToMultiByte(CP_UTF8, 0, pInfo->Domain, szlen, + domain, sizeof(domain), NULL, NULL); + + DebugEvent0("AFS_Logon_Event - Calling GetDomainLogonOptions"); + GetDomainLogonOptions(NULL, username, domain, &opt); + } else { + if (!pInfo->UserName) + DebugEvent0("AFS_Logon_Event - No pInfo->UserName"); + if (!pInfo->Domain) + DebugEvent0("AFS_Logon_Event - No pInfo->Domain"); + } + + DebugEvent("AFS_Logon_Event - opt.LogonOption = %lX opt.flags = %lX", + opt.LogonOption, opt.flags); + + if (!ISLOGONINTEGRATED(opt.LogonOption) || !ISREMOTE(opt.flags)) { + DebugEvent0("AFS_Logon_Event - Logon is not integrated or not remote"); + goto done_logon_event; + } + + DebugEvent0("AFS_Logon_Event - Calling GetTokenInformation"); + if (!GetTokenInformation(pInfo->hToken, TokenUser, NULL, 0, &retLen)) { if ( GetLastError() == ERROR_INSUFFICIENT_BUFFER ) { *************** *** 1121,1126 **** --- 1212,1218 ---- DebugEvent0("AFS_Logon_Event - Unable to load profile"); } + done_logon_event: dwSize = sizeof(szUserA); if (!KFW_AFS_get_lsa_principal(szUserA, &dwSize)) { StringCbPrintfW(szUserW, sizeof(szUserW), L"%s\\%s", pInfo->Domain, pInfo->UserName); *************** *** 1157,1163 **** GetSecurityLogonSessionData(HANDLE hToken, PSECURITY_LOGON_SESSION_DATA * ppSessionData) { NTSTATUS Status = 0; - HANDLE TokenHandle; TOKEN_STATISTICS Stats; DWORD ReqLen; BOOL Success; --- 1249,1254 ---- *************** *** 1166,1181 **** return FALSE; *ppSessionData = NULL; - #if 0 - Success = OpenProcessToken( HANDLE GetCurrentProcess(), TOKEN_QUERY, &TokenHandle ); - if ( !Success ) - return FALSE; - #endif - Success = GetTokenInformation( hToken, TokenStatistics, &Stats, sizeof(TOKEN_STATISTICS), &ReqLen ); - #if 0 - CloseHandle( TokenHandle ); - #endif if ( !Success ) return FALSE; --- 1257,1263 ---- *************** *** 1188,1208 **** VOID KFW_Logon_Event( PWLX_NOTIFICATION_INFO pInfo ) { - DWORD code; - WCHAR szUserW[128] = L""; char szUserA[128] = ""; - char szClient[MAX_PATH]; char szPath[MAX_PATH] = ""; char szLogonId[128] = ""; - NETRESOURCE nr; - DWORD res; - DWORD gle; - DWORD dwSize; - DWORD dwDisp; - DWORD dwType; DWORD count; - VOID * ticketData; char filename[256]; char commandline[512]; STARTUPINFO startupinfo; --- 1270,1280 ---- Index: openafs/src/WINNT/afsd/cm_aclent.c diff -c openafs/src/WINNT/afsd/cm_aclent.c:1.4.2.8 openafs/src/WINNT/afsd/cm_aclent.c:1.4.2.9 *** openafs/src/WINNT/afsd/cm_aclent.c:1.4.2.8 Fri Aug 5 20:36:11 2005 --- openafs/src/WINNT/afsd/cm_aclent.c Mon Feb 13 11:33:06 2006 *************** *** 91,104 **** &aclp->q); } else { *rightsp = aclp->randomAccess; ! if (cm_data.aclLRUEndp == aclp) ! cm_data.aclLRUEndp = (cm_aclent_t *) osi_QPrev(&aclp->q); ! ! /* move to the head of the LRU queue */ ! osi_QRemove((osi_queue_t **) &cm_data.aclLRUp, &aclp->q); ! osi_QAddH((osi_queue_t **) &cm_data.aclLRUp, ! (osi_queue_t **) &cm_data.aclLRUEndp, ! &aclp->q); retval = 0; /* success */ } break; --- 91,106 ---- &aclp->q); } else { *rightsp = aclp->randomAccess; ! if (cm_data.aclLRUp != aclp) { ! if (cm_data.aclLRUEndp == aclp) ! cm_data.aclLRUEndp = (cm_aclent_t *) osi_QPrev(&aclp->q); ! ! /* move to the head of the LRU queue */ ! osi_QRemove((osi_queue_t **) &cm_data.aclLRUp, &aclp->q); ! osi_QAddH((osi_queue_t **) &cm_data.aclLRUp, ! (osi_queue_t **) &cm_data.aclLRUEndp, ! &aclp->q); ! } retval = 0; /* success */ } break; Index: openafs/src/WINNT/afsd/cm_cell.c diff -c openafs/src/WINNT/afsd/cm_cell.c:1.14.2.6 openafs/src/WINNT/afsd/cm_cell.c:1.14.2.9 *** openafs/src/WINNT/afsd/cm_cell.c:1.14.2.6 Wed Dec 14 00:30:53 2005 --- openafs/src/WINNT/afsd/cm_cell.c Sun Feb 12 01:24:27 2006 *************** *** 61,71 **** */ cm_cell_t *cm_UpdateCell(cm_cell_t * cp) { ! long code; if (cp == NULL) return NULL; if ((cp->vlServersp == NULL #ifdef AFS_FREELANCE_CLIENT && !(cp->flags & CM_CELLFLAG_FREELANCE) --- 61,72 ---- */ cm_cell_t *cm_UpdateCell(cm_cell_t * cp) { ! long code = 0; if (cp == NULL) return NULL; + lock_ObtainMutex(&cp->mx); if ((cp->vlServersp == NULL #ifdef AFS_FREELANCE_CLIENT && !(cp->flags & CM_CELLFLAG_FREELANCE) *************** *** 83,90 **** } code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, cp); - if (code) { #ifdef AFS_AFSDB_ENV if (cm_dnsEnabled) { int ttl; --- 84,91 ---- } code = cm_SearchCellFile(cp->name, NULL, cm_AddCellProc, cp); #ifdef AFS_AFSDB_ENV + if (code) { if (cm_dnsEnabled) { int ttl; *************** *** 101,118 **** * current entry alone */ cp->flags |= CM_CELLFLAG_VLSERVER_INVALID; - cp = NULL; /* return NULL to indicate failure */ } ! } else #endif /* AFS_AFSDB_ENV */ ! { ! cp = NULL; /* return NULL to indicate failure */ ! } ! } else { cp->timeout = time(0) + 7200; } } ! return cp; } /* load up a cell structure from the cell database, afsdcell.ini */ --- 102,117 ---- * current entry alone */ cp->flags |= CM_CELLFLAG_VLSERVER_INVALID; } ! } ! } else #endif /* AFS_AFSDB_ENV */ ! { cp->timeout = time(0) + 7200; } } ! lock_ReleaseMutex(&cp->mx); ! return code ? NULL : cp; } /* load up a cell structure from the cell database, afsdcell.ini */ *************** *** 132,138 **** lock_ObtainWrite(&cm_cellLock); for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { ! if (strcmp(namep, cp->name) == 0) { strcpy(fullname, cp->name); break; } --- 131,137 ---- lock_ObtainWrite(&cm_cellLock); for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { ! if (stricmp(namep, cp->name) == 0) { strcpy(fullname, cp->name); break; } Index: openafs/src/WINNT/afsd/cm_conn.c diff -c openafs/src/WINNT/afsd/cm_conn.c:1.25.2.19 openafs/src/WINNT/afsd/cm_conn.c:1.25.2.20 *** openafs/src/WINNT/afsd/cm_conn.c:1.25.2.19 Sun Jan 15 21:06:59 2006 --- openafs/src/WINNT/afsd/cm_conn.c Wed Feb 1 13:03:18 2006 *************** *** 406,415 **** cm_scache_t * scp; osi_Log4(afsd_logp, "cm_Analyze passed VNOVNODE cell %u vol %u vn %u uniq %u.", fidp->cell, fidp->volume, fidp->vnode, fidp->unique); ! if (!cm_GetSCache(fidp, &scp, userp, reqp)) { ! cm_FlushParent(scp, userp, reqp); ! cm_FlushFile(scp, userp, reqp); cm_ReleaseSCache(scp); } } else { osi_Log0(afsd_logp, "cm_Analyze passed VNOVNODE unknown fid."); --- 406,424 ---- cm_scache_t * scp; osi_Log4(afsd_logp, "cm_Analyze passed VNOVNODE cell %u vol %u vn %u uniq %u.", fidp->cell, fidp->volume, fidp->vnode, fidp->unique); ! scp = cm_FindSCache(fidp); ! if (scp) { ! cm_scache_t *pscp = cm_FindSCacheParent(scp); ! cm_CleanFile(scp, userp, reqp); cm_ReleaseSCache(scp); + if (pscp) { + if (pscp->cbExpires > 0 && pscp->cbServerp != NULL) { + lock_ObtainMutex(&pscp->mx); + cm_DiscardSCache(pscp); + lock_ReleaseMutex(&pscp->mx); + } + cm_ReleaseSCache(pscp); + } } } else { osi_Log0(afsd_logp, "cm_Analyze passed VNOVNODE unknown fid."); Index: openafs/src/WINNT/afsd/cm_dcache.c diff -c openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.16 openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.17 *** openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.16 Mon Nov 21 19:30:01 2005 --- openafs/src/WINNT/afsd/cm_dcache.c Wed Feb 1 13:03:18 2006 *************** *** 501,506 **** --- 501,507 ---- lock_ReleaseMutex(&scp->mx); } + /* Called with scp locked */ void cm_ClearPrefetchFlag(long code, cm_scache_t *scp, osi_hyper_t *base) { osi_hyper_t thyper; Index: openafs/src/WINNT/afsd/cm_freelance.c diff -c openafs/src/WINNT/afsd/cm_freelance.c:1.15.2.12 openafs/src/WINNT/afsd/cm_freelance.c:1.15.2.14 *** openafs/src/WINNT/afsd/cm_freelance.c:1.15.2.12 Fri Mar 11 01:58:41 2005 --- openafs/src/WINNT/afsd/cm_freelance.c Mon Feb 6 02:07:08 2006 *************** *** 217,223 **** /* Reserve 2 directory chunks for "." and ".." */ curChunk += 2; ! while (curDirEntry!=cm_noLocalMountPoints) { sizeOfCurEntry = cm_NameEntries((cm_localMountPoints+curDirEntry)->namep, 0); if ((curChunk + sizeOfCurEntry >= CPP) || (curDirEntryInPage + 1 >= CM_DIR_EPP)) { --- 217,223 ---- /* Reserve 2 directory chunks for "." and ".." */ curChunk += 2; ! while (curDirEntrynamep, 0); if ((curChunk + sizeOfCurEntry >= CPP) || (curDirEntryInPage + 1 >= CM_DIR_EPP)) { *************** *** 282,288 **** // 2. we have less than CM_DIR_EPP entries in page 0 // 3. we're not out of chunks in page 0 ! while( (curDirEntry!=cm_noLocalMountPoints) && (curDirEntryInPage < CM_DIR_EPP) && (curChunk + cm_NameEntries((cm_localMountPoints+curDirEntry)->namep, 0) <= CPP)) { --- 282,288 ---- // 2. we have less than CM_DIR_EPP entries in page 0 // 3. we're not out of chunks in page 0 ! while( (curDirEntrynamep, 0) <= CPP)) { *************** *** 311,317 **** curPage++; // ok, page 0's done. Move on to the next page. ! while (curDirEntry!=cm_noLocalMountPoints) { // setup a new page curChunk = 1; // the zeroth chunk is reserved for page header curDirEntryInPage = 0; --- 311,317 ---- curPage++; // ok, page 0's done. Move on to the next page. ! while (curDirEntrynamep, 0) <= CPP)) { --- 323,329 ---- fakePageHeader.tag = htons(1234); // while we're on the same page... ! while ( (curDirEntrynamep, 0) <= CPP)) { *************** *** 426,432 **** --- 426,434 ---- lscpp = &tscp->nextp, tscp = tscp->nextp) { if (tscp == scp) { *lscpp = scp->nextp; + lock_ObtainMutex(&scp->mx); scp->flags &= ~CM_SCACHEFLAG_INHASH; + lock_ReleaseMutex(&scp->mx); break; } } Index: openafs/src/WINNT/afsd/cm_ioctl.c diff -c openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.24 openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.25 *** openafs/src/WINNT/afsd/cm_ioctl.c:1.33.2.24 Thu Jan 19 18:08:44 2006 --- openafs/src/WINNT/afsd/cm_ioctl.c Wed Feb 1 13:03:18 2006 *************** *** 62,67 **** --- 62,84 ---- lock_InitializeMutex(&cm_Afsdsbmt_Lock, "AFSDSBMT.INI Access Lock"); } + + long cm_CleanFile(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) + { + long code; + + lock_ObtainWrite(&scp->bufCreateLock); + code = buf_CleanVnode(scp, userp, reqp); + + lock_ObtainMutex(&scp->mx); + cm_DiscardSCache(scp); + lock_ReleaseMutex(&scp->mx); + + lock_ReleaseWrite(&scp->bufCreateLock); + osi_Log2(afsd_logp,"cm_CleanFile scp 0x%x returns error: [%x]",scp, code); + return code; + } + long cm_FlushFile(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) { long code; *************** *** 70,83 **** code = buf_FlushCleanPages(scp, userp, reqp); lock_ObtainMutex(&scp->mx); ! scp->cbServerp = NULL; ! scp->cbExpires = 0; ! cm_dnlcPurgedp(scp); ! cm_dnlcPurgevp(scp); ! cm_FreeAllACLEnts(scp); ! ! /* Force mount points and symlinks to be re-evaluated */ ! scp->mountPointStringp[0] = '\0'; lock_ReleaseMutex(&scp->mx); --- 87,93 ---- code = buf_FlushCleanPages(scp, userp, reqp); lock_ObtainMutex(&scp->mx); ! cm_DiscardSCache(scp); lock_ReleaseMutex(&scp->mx); *************** *** 89,118 **** long cm_FlushParent(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) { long code = 0; ! int i; ! cm_fid_t parent_fid; ! ! lock_ObtainWrite(&cm_scacheLock); ! cm_HoldSCacheNoLock(scp); ! parent_fid = scp->fid; ! parent_fid.vnode = scp->parentVnode; ! parent_fid.unique = scp->parentUnique; ! cm_ReleaseSCacheNoLock(scp); ! for (i=0; inextp) { ! if (!cm_FidCmp(&scp->fid, &parent_fid)) { ! cm_HoldSCacheNoLock(scp); ! lock_ReleaseWrite(&cm_scacheLock); ! /* now flush the file */ ! code = cm_FlushFile(scp, userp, reqp); ! lock_ObtainWrite(&cm_scacheLock); ! cm_ReleaseSCacheNoLock(scp); ! } ! } ! } ! lock_ReleaseWrite(&cm_scacheLock); return code; } --- 99,111 ---- long cm_FlushParent(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp) { long code = 0; ! cm_scache_t * pscp; ! pscp = cm_FindSCacheParent(scp); ! /* now flush the file */ ! code = cm_FlushFile(pscp, userp, reqp); ! cm_ReleaseSCache(scp); return code; } *************** *** 1266,1271 **** --- 1259,1265 ---- for (cp = cm_data.allCellsp; cp; cp=cp->nextp) { long code; + lock_ObtainMutex(&cp->mx); /* delete all previous server lists - cm_FreeServerList will ask for write on cm_ServerLock*/ cm_FreeServerList(&cp->vlServersp); cp->vlServersp = NULL; *************** *** 1293,1298 **** --- 1287,1293 ---- cp->flags &= ~CM_CELLFLAG_VLSERVER_INVALID; cm_RandomizeServer(&cp->vlServersp); } + lock_ReleaseMutex(&cp->mx); } lock_ReleaseWrite(&cm_cellLock); Index: openafs/src/WINNT/afsd/cm_ioctl.h diff -c openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.5 openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.6 *** openafs/src/WINNT/afsd/cm_ioctl.h:1.8.2.5 Mon Nov 21 19:30:01 2005 --- openafs/src/WINNT/afsd/cm_ioctl.h Wed Feb 1 13:03:18 2006 *************** *** 116,121 **** --- 116,123 ---- extern long cm_IoctlCreateMountPoint(smb_ioctl_t *ioctlp, cm_user_t *userp); + extern long cm_CleanFile(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp); + extern long cm_FlushFile(cm_scache_t *scp, cm_user_t *userp, cm_req_t *reqp); extern long cm_FlushVolume(cm_user_t *, cm_req_t *reqp, afs_uint32 cell, afs_uint32 volume); Index: openafs/src/WINNT/afsd/cm_memmap.c diff -c openafs/src/WINNT/afsd/cm_memmap.c:1.1.2.4 openafs/src/WINNT/afsd/cm_memmap.c:1.1.2.5 *** openafs/src/WINNT/afsd/cm_memmap.c:1.1.2.4 Fri Sep 9 15:49:30 2005 --- openafs/src/WINNT/afsd/cm_memmap.c Mon Feb 6 02:07:08 2006 *************** *** 474,480 **** // Check input buffer length. // If too small, indicate the proper size and set the last error. ! if (*lpdwBufferLen < dwSidSize) { *lpdwBufferLen = dwSidSize; SetLastError(ERROR_INSUFFICIENT_BUFFER); --- 474,480 ---- // Check input buffer length. // If too small, indicate the proper size and set the last error. ! if (TextualSid == NULL || *lpdwBufferLen < dwSidSize) { *lpdwBufferLen = dwSidSize; SetLastError(ERROR_INSUFFICIENT_BUFFER); Index: openafs/src/WINNT/afsd/cm_scache.c diff -c openafs/src/WINNT/afsd/cm_scache.c:1.14.2.14 openafs/src/WINNT/afsd/cm_scache.c:1.14.2.15 *** openafs/src/WINNT/afsd/cm_scache.c:1.14.2.14 Wed Oct 5 01:12:27 2005 --- openafs/src/WINNT/afsd/cm_scache.c Wed Feb 1 13:03:18 2006 *************** *** 473,479 **** mp = ""; } scp = cm_GetNewSCache(); ! scp->fid = *fidp; scp->volp = cm_data.rootSCachep->volp; scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID; --- 473,480 ---- mp = ""; } scp = cm_GetNewSCache(); ! ! lock_ObtainMutex(&scp->mx); scp->fid = *fidp; scp->volp = cm_data.rootSCachep->volp; scp->dotdotFid.cell=AFS_FAKE_ROOT_CELL_ID; *************** *** 504,509 **** --- 505,511 ---- scp->parentVnode=0x1; scp->group=0; scp->dataVersion=cm_data.fakeDirVersion; + lock_ReleaseMutex(&scp->mx); *outScpp = scp; lock_ReleaseWrite(&cm_scacheLock); /*afsi_log(" getscache done");*/ *************** *** 544,549 **** --- 546,552 ---- /* now, if we don't have the fid, recycle something */ scp = cm_GetNewSCache(); osi_assert(!(scp->flags & CM_SCACHEFLAG_INHASH)); + lock_ObtainMutex(&scp->mx); scp->fid = *fidp; scp->volp = volp; /* a held reference */ *************** *** 565,570 **** --- 568,574 ---- cm_data.hashTablep[hash] = scp; scp->flags |= CM_SCACHEFLAG_INHASH; scp->refCount = 1; + lock_ReleaseMutex(&scp->mx); /* XXX - The following fields in the cm_scache are * uninitialized: *************** *** 579,584 **** --- 583,618 ---- return 0; } + + /* Returns a held reference to the scache's parent + * if it exists */ + cm_scache_t * cm_FindSCacheParent(cm_scache_t * scp) + { + long code = 0; + int i; + cm_fid_t parent_fid; + cm_scache_t * pscp = NULL; + + lock_ObtainWrite(&cm_scacheLock); + parent_fid = scp->fid; + parent_fid.vnode = scp->parentVnode; + parent_fid.unique = scp->parentUnique; + + if (cm_FidCmp(&scp->fid, &parent_fid)) { + for (i=0; inextp) { + if (!cm_FidCmp(&pscp->fid, &parent_fid)) { + cm_HoldSCacheNoLock(pscp); + break; + } + } + } + } + lock_ReleaseWrite(&cm_scacheLock); + + return pscp; + } + /* synchronize a fetch, store, read, write, fetch status or store status. * Called with scache mutex held, and returns with it held, but temporarily * drops it during the fetch. *************** *** 1180,1188 **** --- 1214,1226 ---- scp->cbServerp = NULL; } scp->cbExpires = 0; + scp->flags &= ~CM_SCACHEFLAG_CALLBACK; cm_dnlcPurgedp(scp); cm_dnlcPurgevp(scp); cm_FreeAllACLEnts(scp); + + /* Force mount points and symlinks to be re-evaluated */ + scp->mountPointStringp[0] = '\0'; } void cm_AFSFidFromFid(AFSFid *afsFidp, cm_fid_t *fidp) Index: openafs/src/WINNT/afsd/cm_scache.h diff -c openafs/src/WINNT/afsd/cm_scache.h:1.4.2.11 openafs/src/WINNT/afsd/cm_scache.h:1.4.2.12 *** openafs/src/WINNT/afsd/cm_scache.h:1.4.2.11 Sun Jan 8 23:49:17 2006 --- openafs/src/WINNT/afsd/cm_scache.h Wed Feb 1 13:03:18 2006 *************** *** 315,320 **** --- 315,322 ---- extern cm_scache_t *cm_FindSCache(cm_fid_t *fidp); + extern cm_scache_t *cm_FindSCacheParent(cm_scache_t *); + extern osi_rwlock_t cm_scacheLock; extern osi_queue_t *cm_allFileLocks; Index: openafs/src/WINNT/afsd/cm_server.c diff -c openafs/src/WINNT/afsd/cm_server.c:1.13.2.7 openafs/src/WINNT/afsd/cm_server.c:1.13.2.8 *** openafs/src/WINNT/afsd/cm_server.c:1.13.2.7 Mon Nov 21 19:30:01 2005 --- openafs/src/WINNT/afsd/cm_server.c Mon Feb 13 11:29:43 2006 *************** *** 235,240 **** --- 235,241 ---- tsp->refCount = 1; lock_InitializeMutex(&tsp->mx, "cm_server_t mutex"); tsp->addr = *socketp; + tsp->flags = CM_SERVERFLAG_DOWN; /* assume down; ping will mark up if available */ cm_SetServerPrefs(tsp); Index: openafs/src/WINNT/afsd/cm_vnodeops.c diff -c openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.33 openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.35 *** openafs/src/WINNT/afsd/cm_vnodeops.c:1.19.2.33 Sun Jan 15 21:06:59 2006 --- openafs/src/WINNT/afsd/cm_vnodeops.c Sun Feb 5 12:47:49 2006 *************** *** 952,958 **** /* parse the volume name */ mpNamep = scp->mountPointStringp; ! osi_assert(mpNamep[0]); tlen = strlen(scp->mountPointStringp); mtType = *scp->mountPointStringp; cellNamep = malloc(tlen); --- 952,959 ---- /* parse the volume name */ mpNamep = scp->mountPointStringp; ! if (!mpNamep[0]) ! return CM_ERROR_NOSUCHPATH; tlen = strlen(scp->mountPointStringp); mtType = *scp->mountPointStringp; cellNamep = malloc(tlen); *************** *** 1180,1186 **** if ( !dnlcHit && !(flags & CM_FLAG_NOMOUNTCHASE) && rock.ExactFound ) { /* lock the directory entry to prevent racing callback revokes */ lock_ObtainMutex(&dscp->mx); ! if ( dscp->cbServerp && dscp->cbExpires ) cm_dnlcEnter(dscp, namep, tscp); lock_ReleaseMutex(&dscp->mx); } --- 1181,1187 ---- if ( !dnlcHit && !(flags & CM_FLAG_NOMOUNTCHASE) && rock.ExactFound ) { /* lock the directory entry to prevent racing callback revokes */ lock_ObtainMutex(&dscp->mx); ! if ( dscp->cbServerp != NULL && dscp->cbExpires > 0 ) cm_dnlcEnter(dscp, namep, tscp); lock_ReleaseMutex(&dscp->mx); } Index: openafs/src/WINNT/afsd/smb.c diff -c openafs/src/WINNT/afsd/smb.c:1.55.2.43 openafs/src/WINNT/afsd/smb.c:1.55.2.48 *** openafs/src/WINNT/afsd/smb.c:1.55.2.43 Tue Jan 31 04:09:59 2006 --- openafs/src/WINNT/afsd/smb.c Sun Feb 12 01:24:27 2006 *************** *** 38,44 **** static char *illegalChars = "\\/:*?\"<>|"; BOOL isWindows2000 = FALSE; - smb_vc_t *dead_vcp = NULL; smb_vc_t *active_vcp = NULL; int smbShutdownFlag = 0; --- 38,43 ---- *************** *** 954,960 **** for (fidpIter = vcp->fidsp; fidpIter; fidpIter = fidpNext) { fidpNext = (smb_fid_t *) osi_QNext(&fidpIter->q); ! if (fidpIter->flags & SMB_FID_DELETE) continue; fid = fidpIter->fid; --- 953,959 ---- for (fidpIter = vcp->fidsp; fidpIter; fidpIter = fidpNext) { fidpNext = (smb_fid_t *) osi_QNext(&fidpIter->q); ! if (fidpIter->delete) continue; fid = fidpIter->fid; *************** *** 963,969 **** smb_HoldFIDNoLock(fidpIter); lock_ReleaseWrite(&smb_rctLock); - /* smb_CloseFID sets SMB_FID_DELETE on Success */ smb_CloseFID(vcp, fidpIter, NULL, 0); smb_ReleaseFID(fidpIter); --- 962,967 ---- *************** *** 973,991 **** for (tidpIter = vcp->tidsp; tidpIter; tidpIter = tidpNext) { tidpNext = tidpIter->nextp; ! if (tidpIter->flags & SMB_TIDFLAG_DELETE) continue; tid = tidpIter->tid; osi_Log2(smb_logp, " Cleanup TID %d (tidp=0x%x)", tid, tidpIter); smb_HoldTIDNoLock(tidpIter); lock_ReleaseWrite(&smb_rctLock); - - lock_ObtainMutex(&tidpIter->mx); - tidpIter->flags |= SMB_TIDFLAG_DELETE; - lock_ReleaseMutex(&tidpIter->mx); - smb_ReleaseTID(tidpIter); lock_ObtainWrite(&smb_rctLock); --- 971,985 ---- for (tidpIter = vcp->tidsp; tidpIter; tidpIter = tidpNext) { tidpNext = tidpIter->nextp; ! if (tidpIter->delete) continue; + tidpIter->delete = 1; tid = tidpIter->tid; osi_Log2(smb_logp, " Cleanup TID %d (tidp=0x%x)", tid, tidpIter); smb_HoldTIDNoLock(tidpIter); lock_ReleaseWrite(&smb_rctLock); smb_ReleaseTID(tidpIter); lock_ObtainWrite(&smb_rctLock); *************** *** 994,1001 **** for (uidpIter = vcp->usersp; uidpIter; uidpIter = uidpNext) { uidpNext = uidpIter->nextp; ! if (uidpIter->flags & SMB_USERFLAG_DELETE) continue; uid = uidpIter->userID; osi_Log2(smb_logp, " Cleanup UID %d (uidp=0x%x)", uid, uidpIter); --- 988,996 ---- for (uidpIter = vcp->usersp; uidpIter; uidpIter = uidpNext) { uidpNext = uidpIter->nextp; ! if (uidpIter->delete) continue; + uidpIter->delete = 1; uid = uidpIter->userID; osi_Log2(smb_logp, " Cleanup UID %d (uidp=0x%x)", uid, uidpIter); *************** *** 1004,1013 **** * as the smb_vc_t already is holding a reference */ lock_ReleaseWrite(&smb_rctLock); - lock_ObtainMutex(&uidpIter->mx); - uidpIter->flags |= SMB_USERFLAG_DELETE; - lock_ReleaseMutex(&uidpIter->mx); - smb_ReleaseUID(uidpIter); lock_ObtainWrite(&smb_rctLock); --- 999,1004 ---- *************** *** 1072,1078 **** userp = NULL; lock_ObtainWrite(&smb_rctLock); osi_assert(tidp->refCount-- > 0); ! if (tidp->refCount == 0 && (tidp->flags & SMB_TIDFLAG_DELETE)) { ltpp = &tidp->vcp->tidsp; for(tp = *ltpp; tp; ltpp = &tp->nextp, tp = *ltpp) { if (tp == tidp) --- 1063,1069 ---- userp = NULL; lock_ObtainWrite(&smb_rctLock); osi_assert(tidp->refCount-- > 0); ! if (tidp->refCount == 0 && (tidp->delete)) { ltpp = &tidp->vcp->tidsp; for(tp = *ltpp; tp; ltpp = &tp->nextp, tp = *ltpp) { if (tp == tidp) *************** *** 1329,1335 **** if (fid == fidp->fid) { if (newFid) { fid++; ! if (fid == 0) { osi_Log1(smb_logp, "New FID number wraps on vcp 0x%x", vcp); fid = 1; --- 1320,1326 ---- if (fid == fidp->fid) { if (newFid) { fid++; ! if (fid == 0xFFFF) { osi_Log1(smb_logp, "New FID number wraps on vcp 0x%x", vcp); fid = 1; *************** *** 1350,1356 **** osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName)); thrd_CloseHandle(event); fid++; ! if (fid == 0) { osi_Log1(smb_logp, "New FID wraps around for vcp 0x%x", vcp); fid = 1; } --- 1341,1347 ---- osi_Log1(smb_logp, "Event Object Already Exists: %s", osi_LogSaveString(smb_logp, eventName)); thrd_CloseHandle(event); fid++; ! if (fid == 0xFFFF) { osi_Log1(smb_logp, "New FID wraps around for vcp 0x%x", vcp); fid = 1; } *************** *** 1369,1375 **** fidp->raw_write_event = event; if (newFid) { vcp->fidCounter = fid+1; ! if (vcp->fidCounter == 0) { osi_Log1(smb_logp, "fidCounter wrapped around for vcp 0x%x", vcp); vcp->fidCounter = 1; --- 1360,1366 ---- fidp->raw_write_event = event; if (newFid) { vcp->fidCounter = fid+1; ! if (vcp->fidCounter == 0xFFFF) { osi_Log1(smb_logp, "fidCounter wrapped around for vcp 0x%x", vcp); vcp->fidCounter = 1; *************** *** 1396,1424 **** lock_ObtainWrite(&smb_rctLock); osi_assert(fidp->refCount-- > 0); lock_ObtainMutex(&fidp->mx); ! if (fidp->refCount == 0 && (fidp->flags & SMB_FID_DELETE)) { ! vcp = fidp->vcp; ! fidp->vcp = NULL; ! scp = fidp->scp; /* release after lock is released */ ! fidp->scp = NULL; ! userp = fidp->userp; ! fidp->userp = NULL; ! ! osi_QRemove((osi_queue_t **) &vcp->fidsp, &fidp->q); ! thrd_CloseHandle(fidp->raw_write_event); ! ! /* and see if there is ioctl stuff to free */ ! ioctlp = fidp->ioctlp; ! if (ioctlp) { ! if (ioctlp->prefix) ! cm_FreeSpace(ioctlp->prefix); ! if (ioctlp->inAllocp) ! free(ioctlp->inAllocp); ! if (ioctlp->outAllocp) ! free(ioctlp->outAllocp); ! free(ioctlp); ! } ! lock_ReleaseMutex(&fidp->mx); lock_FinalizeMutex(&fidp->mx); free(fidp); --- 1387,1415 ---- lock_ObtainWrite(&smb_rctLock); osi_assert(fidp->refCount-- > 0); lock_ObtainMutex(&fidp->mx); ! if (fidp->refCount == 0 && (fidp->delete)) { ! vcp = fidp->vcp; ! fidp->vcp = NULL; ! scp = fidp->scp; /* release after lock is released */ ! fidp->scp = NULL; ! userp = fidp->userp; ! fidp->userp = NULL; ! ! if (vcp->fidsp) ! osi_QRemove((osi_queue_t **) &vcp->fidsp, &fidp->q); ! thrd_CloseHandle(fidp->raw_write_event); ! ! /* and see if there is ioctl stuff to free */ ! ioctlp = fidp->ioctlp; ! if (ioctlp) { ! if (ioctlp->prefix) ! cm_FreeSpace(ioctlp->prefix); ! if (ioctlp->inAllocp) ! free(ioctlp->inAllocp); ! if (ioctlp->outAllocp) ! free(ioctlp->outAllocp); ! free(ioctlp); ! } lock_ReleaseMutex(&fidp->mx); lock_FinalizeMutex(&fidp->mx); free(fidp); *************** *** 1913,1919 **** --- 1904,1912 ---- */ if (tp->refCount == 0 && (isV3 || tp->cookie <= 255)) { /* hold and delete */ + lock_ObtainMutex(&tp->mx); tp->flags |= SMB_DIRSEARCH_DELETE; + lock_ReleaseMutex(&tp->mx); victimsp[victimCount++] = tp; tp->refCount++; } *************** *** 2481,2507 **** s = "unknown error"; } osi_Log2(smb_logp, "SendPacket failure code %d \"%s\"", code, s); ! osi_Log2(smb_logp, "setting dead_vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); ! smb_HoldVC(vcp); lock_ObtainMutex(&vcp->mx); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); - lock_ObtainWrite(&smb_globalLock); ! if (dead_vcp) { ! smb_vc_t * dvcp = dead_vcp; ! dead_vcp = vcp; ! dead_sessions[vcp->session] = TRUE; ! lock_ReleaseWrite(&smb_globalLock); ! osi_Log1(smb_logp,"Previous dead_vcp %x", dvcp); ! smb_CleanupDeadVC(dvcp); ! smb_ReleaseVC(dvcp); ! } else { ! dead_vcp = vcp; ! dead_sessions[vcp->session] = TRUE; ! lock_ReleaseWrite(&smb_globalLock); ! } } if (localNCB) --- 2474,2489 ---- s = "unknown error"; } osi_Log2(smb_logp, "SendPacket failure code %d \"%s\"", code, s); ! osi_Log2(smb_logp, "marking dead vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); ! lock_ObtainMutex(&vcp->mx); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); lock_ObtainWrite(&smb_globalLock); ! dead_sessions[vcp->session] = TRUE; ! lock_ReleaseWrite(&smb_globalLock); ! smb_CleanupDeadVC(vcp); } if (localNCB) *************** *** 3092,3097 **** --- 3074,3080 ---- tcounter++; /* which proto entry we're looking at */ } + lock_ObtainMutex(&vcp->mx); if (NTProtoIndex != -1) { protoIndex = NTProtoIndex; vcp->flags |= (SMB_VCFLAG_USENT | SMB_VCFLAG_USEV3); *************** *** 3105,3110 **** --- 3088,3094 ---- vcp->flags |= SMB_VCFLAG_USECORE; } else protoIndex = -1; + lock_ReleaseMutex(&vcp->mx); if (protoIndex == -1) return CM_ERROR_INVAL; *************** *** 3249,3263 **** void smb_CheckVCs(void) { ! smb_vc_t * vcp; smb_packet_t * outp = GetPacket(); smb_t *smbp; ! for ( vcp=smb_allVCsp; vcp; vcp = vcp->nextp ) { if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) continue; smb_FormatResponsePacket(vcp, NULL, outp); smbp = (smb_t *)outp; outp->inCom = smbp->com = 0x2b /* Echo */; --- 3233,3253 ---- void smb_CheckVCs(void) { ! smb_vc_t * vcp, *nextp; smb_packet_t * outp = GetPacket(); smb_t *smbp; ! lock_ObtainWrite(&smb_rctLock); ! for ( vcp=smb_allVCsp, nextp=NULL; vcp; vcp = nextp ) { + nextp = vcp->nextp; + if (vcp->flags & SMB_VCFLAG_ALREADYDEAD) continue; + smb_HoldVCNoLock(vcp); + if (nextp) + smb_HoldVCNoLock(nextp); smb_FormatResponsePacket(vcp, NULL, outp); smbp = (smb_t *)outp; outp->inCom = smbp->com = 0x2b /* Echo */; *************** *** 3270,3279 **** smb_SetSMBParm(outp, 0, 0); smb_SetSMBDataLength(outp, 0); smb_SendPacket(vcp, outp); } ! smb_FreePacket(outp); } --- 3260,3275 ---- smb_SetSMBParm(outp, 0, 0); smb_SetSMBDataLength(outp, 0); + lock_ReleaseWrite(&smb_rctLock); smb_SendPacket(vcp, outp); + + lock_ObtainWrite(&smb_rctLock); + smb_ReleaseVCNoLock(vcp); + if (nextp) + smb_ReleaseVCNoLock(nextp); } ! lock_ReleaseWrite(&smb_rctLock); smb_FreePacket(outp); } *************** *** 4727,4735 **** /* find the tree and free it */ tidp = smb_FindTID(vcp, ((smb_t *)inp)->tid, 0); if (tidp) { ! lock_ObtainMutex(&tidp->mx); ! tidp->flags |= SMB_TIDFLAG_DELETE; ! lock_ReleaseMutex(&tidp->mx); smb_ReleaseTID(tidp); } --- 4723,4731 ---- /* find the tree and free it */ tidp = smb_FindTID(vcp, ((smb_t *)inp)->tid, 0); if (tidp) { ! lock_ObtainWrite(&smb_rctLock); ! tidp->delete = 1; ! lock_ReleaseWrite(&smb_rctLock); smb_ReleaseTID(tidp); } *************** *** 5691,5706 **** cm_InitReq(&req); ! lock_ObtainMutex(&fidp->mx); ! ! if (fidp->flags & SMB_FID_DELETE) { osi_Log0(smb_logp, " Fid already closed."); ! lock_ReleaseMutex(&fidp->mx); return CM_ERROR_BADFD; } ! fidp->flags |= SMB_FID_DELETE; ! /* Don't jump the gun on an async raw write */ while (fidp->raw_writers) { lock_ReleaseMutex(&fidp->mx); --- 5687,5702 ---- cm_InitReq(&req); ! lock_ObtainWrite(&smb_rctLock); ! if (fidp->delete) { osi_Log0(smb_logp, " Fid already closed."); ! lock_ReleaseWrite(&smb_rctLock); return CM_ERROR_BADFD; } + fidp->delete = 1; + lock_ReleaseWrite(&smb_rctLock); ! lock_ObtainMutex(&fidp->mx); /* Don't jump the gun on an async raw write */ while (fidp->raw_writers) { lock_ReleaseMutex(&fidp->mx); *************** *** 6281,6290 **** truncAttr.length.HighPart = 0; lock_ObtainMutex(&fidp->mx); code = cm_SetAttr(fidp->scp, &truncAttr, userp, &req); lock_ReleaseMutex(&fidp->mx); smb_SetSMBParm(outp, 0, /* count */ 0); smb_SetSMBDataLength(outp, 0); - fidp->flags |= SMB_FID_LENGTHSETDONE; goto done; } --- 6277,6286 ---- truncAttr.length.HighPart = 0; lock_ObtainMutex(&fidp->mx); code = cm_SetAttr(fidp->scp, &truncAttr, userp, &req); + fidp->flags |= SMB_FID_LENGTHSETDONE; lock_ReleaseMutex(&fidp->mx); smb_SetSMBParm(outp, 0, /* count */ 0); smb_SetSMBDataLength(outp, 0); goto done; } *************** *** 7739,7769 **** /* Client closed session */ vcp = smb_FindVC(ncbp->ncb_lsn, 0, lanas[idx_session]); if (vcp) { ! lock_ObtainWrite(&smb_globalLock); ! if (dead_vcp == vcp) { ! osi_Log1(smb_logp, "dead_vcp already set, 0x%x", dead_vcp); ! lock_ReleaseWrite(&smb_globalLock); ! } else if (!(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { ! osi_Log2(smb_logp, "setting dead_vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); - if (dead_vcp) { - smb_vc_t * dvcp = dead_vcp; - dead_vcp = vcp; /* transfer the reference */ - dead_sessions[vcp->session] = TRUE; - lock_ReleaseWrite(&smb_globalLock); - osi_Log1(smb_logp,"Previous dead_vcp %x", dvcp); - smb_CleanupDeadVC(dvcp); - smb_ReleaseVC(dvcp); - } else { - dead_vcp = vcp; /* transfer the reference */ - dead_sessions[vcp->session] = TRUE; - lock_ReleaseWrite(&smb_globalLock); - } - lock_ObtainMutex(&vcp->mx); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); vcp = NULL; ! } } goto doneWithNCB; --- 7735,7755 ---- /* Client closed session */ vcp = smb_FindVC(ncbp->ncb_lsn, 0, lanas[idx_session]); if (vcp) { ! lock_ObtainMutex(&vcp->mx); ! if (!(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { ! osi_Log2(smb_logp, "marking dead vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); + lock_ObtainWrite(&smb_globalLock); + dead_sessions[vcp->session] = TRUE; + lock_ReleaseWrite(&smb_globalLock); + smb_CleanupDeadVC(vcp); + smb_ReleaseVC(vcp); vcp = NULL; ! } else { ! lock_ReleaseMutex(&vcp->mx); ! } } goto doneWithNCB; *************** *** 7805,7837 **** default: /* A weird error code. Log it, sleep, and continue. */ vcp = smb_FindVC(ncbp->ncb_lsn, 0, lanas[idx_session]); if (vcp && vcp->errorCount++ > 3) { osi_Log2(smb_logp, "session [ %d ] closed, vcp->errorCount = %d", idx_session, vcp->errorCount); ! lock_ObtainWrite(&smb_globalLock); ! if (dead_vcp == vcp) { ! osi_Log1(smb_logp, "dead_vcp already set, 0x%x", dead_vcp); ! lock_ReleaseWrite(&smb_globalLock); ! } else if (!(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { ! osi_Log2(smb_logp, "setting dead_vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); - if (dead_vcp) { - smb_vc_t * dvcp = dead_vcp; - dead_vcp = vcp; /* transfer reference */ - dead_sessions[vcp->session] = TRUE; - lock_ReleaseWrite(&smb_globalLock); - - osi_Log1(smb_logp,"Previous dead_vcp %x", dvcp); - smb_CleanupDeadVC(dvcp); - smb_ReleaseVC(dvcp); - } - lock_ObtainMutex(&vcp->mx); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); vcp = NULL; } goto doneWithNCB; } else { thrd_Sleep(1000); thrd_SetEvent(SessionEvents[idx_session]); } --- 7791,7819 ---- default: /* A weird error code. Log it, sleep, and continue. */ vcp = smb_FindVC(ncbp->ncb_lsn, 0, lanas[idx_session]); + if (vcp) + lock_ObtainMutex(&vcp->mx); if (vcp && vcp->errorCount++ > 3) { osi_Log2(smb_logp, "session [ %d ] closed, vcp->errorCount = %d", idx_session, vcp->errorCount); ! if (!(vcp->flags & SMB_VCFLAG_ALREADYDEAD)) { ! osi_Log2(smb_logp, "marking dead vcp 0x%x, user struct 0x%x", vcp, vcp->usersp); vcp->flags |= SMB_VCFLAG_ALREADYDEAD; lock_ReleaseMutex(&vcp->mx); + lock_ObtainWrite(&smb_globalLock); + dead_sessions[vcp->session] = TRUE; + lock_ReleaseWrite(&smb_globalLock); + smb_CleanupDeadVC(vcp); + smb_ReleaseVC(vcp); vcp = NULL; + } else { + lock_ReleaseMutex(&vcp->mx); } goto doneWithNCB; } else { + if (vcp) + lock_ReleaseMutex(&vcp->mx); thrd_Sleep(1000); thrd_SetEvent(SessionEvents[idx_session]); } Index: openafs/src/WINNT/afsd/smb.h diff -c openafs/src/WINNT/afsd/smb.h:1.14.2.20 openafs/src/WINNT/afsd/smb.h:1.14.2.21 *** openafs/src/WINNT/afsd/smb.h:1.14.2.20 Tue Jan 24 12:16:07 2006 --- openafs/src/WINNT/afsd/smb.h Sun Feb 12 01:24:28 2006 *************** *** 227,237 **** typedef struct smb_user { struct smb_user *nextp; /* next sibling */ unsigned long refCount; /* ref count */ ! long flags; /* flags; locked by mx */ osi_mutex_t mx; unsigned short userID; /* the session identifier */ struct smb_vc *vcp; /* back ptr to virtual circuit */ struct smb_username *unp; /* user name struct */ } smb_user_t; #define SMB_USERFLAG_DELETE 1 /* delete struct when ref count zero */ --- 227,238 ---- typedef struct smb_user { struct smb_user *nextp; /* next sibling */ unsigned long refCount; /* ref count */ ! afs_uint32 flags; /* flags; locked by mx */ osi_mutex_t mx; unsigned short userID; /* the session identifier */ struct smb_vc *vcp; /* back ptr to virtual circuit */ struct smb_username *unp; /* user name struct */ + afs_uint32 delete; /* ok to del: locked by smb_rctLock */ } smb_user_t; #define SMB_USERFLAG_DELETE 1 /* delete struct when ref count zero */ *************** *** 270,286 **** typedef struct smb_tid { struct smb_tid *nextp; /* next sibling */ unsigned long refCount; ! long flags; osi_mutex_t mx; /* for non-tree-related stuff */ unsigned short tid; /* the tid */ struct smb_vc *vcp; /* back ptr */ struct cm_user *userp; /* user logged in at the * tree connect level (base) */ char *pathname; /* pathname derived from sharename */ } smb_tid_t; ! #define SMB_TIDFLAG_DELETE 1 /* delete struct when ref count zero */ ! #define SMB_TIDFLAG_IPC 2 /* IPC$ */ /* one per process ID */ typedef struct smb_pid { --- 271,287 ---- typedef struct smb_tid { struct smb_tid *nextp; /* next sibling */ unsigned long refCount; ! afs_uint32 flags; /* protected by mx */ osi_mutex_t mx; /* for non-tree-related stuff */ unsigned short tid; /* the tid */ struct smb_vc *vcp; /* back ptr */ struct cm_user *userp; /* user logged in at the * tree connect level (base) */ char *pathname; /* pathname derived from sharename */ + afs_uint32 delete; /* ok to del: locked by smb_rctLock */ } smb_tid_t; ! #define SMB_TIDFLAG_IPC 1 /* IPC$ */ /* one per process ID */ typedef struct smb_pid { *************** *** 327,333 **** typedef struct smb_fid { osi_queue_t q; unsigned long refCount; ! unsigned long flags; osi_mutex_t mx; /* for non-tree-related stuff */ unsigned short fid; /* the file ID */ struct smb_vc *vcp; /* back ptr */ --- 328,334 ---- typedef struct smb_fid { osi_queue_t q; unsigned long refCount; ! afs_uint32 flags; /* protected by mx */ osi_mutex_t mx; /* for non-tree-related stuff */ unsigned short fid; /* the file ID */ struct smb_vc *vcp; /* back ptr */ *************** *** 350,360 **** int prev_chunk; /* previous chunk read */ int raw_writers; /* pending async raw writes */ EVENT_HANDLE raw_write_event; /* signal this when raw_writers zero */ } smb_fid_t; #define SMB_FID_OPENREAD 1 /* open for reading */ #define SMB_FID_OPENWRITE 2 /* open for writing */ ! #define SMB_FID_DELETE 4 /* delete struct on ref count 0 */ #define SMB_FID_IOCTL 8 /* a file descriptor for the * magic ioctl file */ #define SMB_FID_OPENDELETE 0x10 /* open for deletion (NT) */ --- 351,362 ---- int prev_chunk; /* previous chunk read */ int raw_writers; /* pending async raw writes */ EVENT_HANDLE raw_write_event; /* signal this when raw_writers zero */ + afs_uint32 delete; /* ok to del: locked by smb_rctLock */ } smb_fid_t; #define SMB_FID_OPENREAD 1 /* open for reading */ #define SMB_FID_OPENWRITE 2 /* open for writing */ ! #define SMB_FID_UNUSED 4 /* free for use */ #define SMB_FID_IOCTL 8 /* a file descriptor for the * magic ioctl file */ #define SMB_FID_OPENDELETE 0x10 /* open for deletion (NT) */ Index: openafs/src/WINNT/afsd/smb3.c diff -c openafs/src/WINNT/afsd/smb3.c:1.42.2.43 openafs/src/WINNT/afsd/smb3.c:1.42.2.44 *** openafs/src/WINNT/afsd/smb3.c:1.42.2.43 Tue Jan 31 04:10:00 2006 --- openafs/src/WINNT/afsd/smb3.c Fri Feb 3 18:05:28 2006 *************** *** 950,961 **** --- 950,968 ---- unp = uidp->unp; lock_ReleaseMutex(&uidp->mx); + #ifdef COMMENT + /* we can't do this. we get logoff messages prior to a session + * disconnect even though it doesn't mean the user is logging out. + * we need to create a new pioctl and EventLogoff handler to set + * SMB_USERNAMEFLAG_LOGOFF. + */ if (unp && smb_LogoffTokenTransfer) { lock_ObtainMutex(&unp->mx); unp->flags |= SMB_USERNAMEFLAG_LOGOFF; unp->last_logoff_t = osi_Time() + smb_LogoffTransferTimeout; lock_ReleaseMutex(&unp->mx); } + #endif smb_ReleaseUID(uidp); } *************** *** 1167,1173 **** return tp; } ! /* free a tran2 packet; must be called with smb_globalLock held */ void smb_FreeTran2Packet(smb_tran2Packet_t *t2p) { if (t2p->vcp) { --- 1174,1180 ---- return tp; } ! /* free a tran2 packet */ void smb_FreeTran2Packet(smb_tran2Packet_t *t2p) { if (t2p->vcp) { *************** *** 1409,1417 **** } /* free the input tran 2 packet */ - lock_ObtainWrite(&smb_globalLock); smb_FreeTran2Packet(asp); - lock_ReleaseWrite(&smb_globalLock); } else if (firstPacket) { /* the first packet in a multi-packet request, we need to send an --- 1416,1422 ---- *************** *** 2047,2055 **** } /* free the input tran 2 packet */ - lock_ObtainWrite(&smb_globalLock); smb_FreeTran2Packet(asp); - lock_ReleaseWrite(&smb_globalLock); } else if (firstPacket) { /* the first packet in a multi-packet request, we need to send an --- 2052,2058 ---- Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.4 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.5 *** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm:1.1.2.4 Mon Jan 9 00:29:23 2006 --- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/frames.htm Sun Feb 5 03:14:16 2006 *************** *** 8,22 **** ! OpenAFS for Windows 1.4.1-RC4 Release Notes