Index: openafs/src/WINNT/afsd/afsd_init.c
diff -c openafs/src/WINNT/afsd/afsd_init.c:1.40.2.31 openafs/src/WINNT/afsd/afsd_init.c:1.40.2.32
*** openafs/src/WINNT/afsd/afsd_init.c:1.40.2.31 Thu Jun 22 17:50:13 2006
--- openafs/src/WINNT/afsd/afsd_init.c Wed Aug 9 22:46:58 2006
***************
*** 268,274 ****
HKEY hkMSV10;
HKEY hkClient;
DWORD dwType;
! DWORD dwSize;
DWORD dwValue;
PBYTE pHostNames = NULL, pName = NULL;
BOOL bNameFound = FALSE;
--- 268,274 ----
HKEY hkMSV10;
HKEY hkClient;
DWORD dwType;
! DWORD dwSize, dwAllocSize;
DWORD dwValue;
PBYTE pHostNames = NULL, pName = NULL;
BOOL bNameFound = FALSE;
***************
*** 280,291 ****
&hkMSV10) == ERROR_SUCCESS )
{
if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0,
! &dwType, NULL, &dwSize) == ERROR_SUCCESS) {
! dwSize += strlen(cm_NetbiosName) + 1;
! pHostNames = malloc(dwSize);
if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, &dwType,
pHostNames, &dwSize) == ERROR_SUCCESS) {
! for (pName = pHostNames; *pName ; pName += strlen(pName) + 1)
{
if ( !stricmp(pName, cm_NetbiosName) ) {
bNameFound = TRUE;
--- 280,295 ----
&hkMSV10) == ERROR_SUCCESS )
{
if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0,
! &dwType, NULL, &dwAllocSize) == ERROR_SUCCESS) {
! dwAllocSize += 1 /* in case the source string is not nul terminated */
! + strlen(cm_NetbiosName) + 2;
! pHostNames = malloc(dwAllocSize);
! dwSize = dwAllocSize;
if (RegQueryValueEx( hkMSV10, "BackConnectionHostNames", 0, &dwType,
pHostNames, &dwSize) == ERROR_SUCCESS) {
! for (pName = pHostNames;
! (pName - pHostNames < dwSize) && *pName;
! pName += strlen(pName) + 1)
{
if ( !stricmp(pName, cm_NetbiosName) ) {
bNameFound = TRUE;
***************
*** 299,305 ****
int size = strlen(cm_NetbiosName) + 2;
if ( !pHostNames ) {
pHostNames = malloc(size);
- dwSize = size;
pName = pHostNames;
}
StringCbCopyA(pName, size, cm_NetbiosName);
--- 303,308 ----
***************
*** 307,313 ****
*pName = '\0'; /* add a second nul terminator */
dwType = REG_MULTI_SZ;
! dwSize += strlen(cm_NetbiosName) + 1;
RegSetValueEx( hkMSV10, "BackConnectionHostNames", 0, dwType, pHostNames, dwSize);
if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE,
--- 310,316 ----
*pName = '\0'; /* add a second nul terminator */
dwType = REG_MULTI_SZ;
! dwSize += pName - pHostNames + 1;
RegSetValueEx( hkMSV10, "BackConnectionHostNames", 0, dwType, pHostNames, dwSize);
if ( RegOpenKeyEx( HKEY_LOCAL_MACHINE,
Index: openafs/src/WINNT/afsd/afslogon.c
diff -c openafs/src/WINNT/afsd/afslogon.c:1.24.2.23 openafs/src/WINNT/afsd/afslogon.c:1.24.2.24
*** openafs/src/WINNT/afsd/afslogon.c:1.24.2.23 Wed Jul 26 08:54:36 2006
--- openafs/src/WINNT/afsd/afslogon.c Thu Aug 3 17:50:05 2006
***************
*** 398,404 ****
hkDoms = NULL;
}
} else
! DebugEvent("Not opening domain key for [%s]", effDomain);
/* Each individual can either be specified on the domain key, the domains key or in the
net provider key. They fail over in that order. If none is found, we just use the
--- 398,404 ----
hkDoms = NULL;
}
} else
! DebugEvent("Not opening domain key");
/* Each individual can either be specified on the domain key, the domains key or in the
net provider key. They fail over in that order. If none is found, we just use the
Index: openafs/src/WINNT/afsd/cm_dcache.c
diff -c openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.17 openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.18
*** openafs/src/WINNT/afsd/cm_dcache.c:1.11.2.17 Wed Feb 1 13:03:18 2006
--- openafs/src/WINNT/afsd/cm_dcache.c Wed Aug 9 22:47:58 2006
***************
*** 944,951 ****
/* add the buffer to the list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, tbp);
! osi_QAdd((osi_queue_t **)&heldBufListp, &qdp->q);
! if (!heldBufListEndp) heldBufListEndp = qdp;
/* leave tbp held (from buf_Get) */
if (!reserving)
--- 944,952 ----
/* add the buffer to the list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, tbp);
! osi_QAddH((osi_queue_t **)&heldBufListp,
! (osi_queue_t **)&heldBufListEndp,
! &qdp->q);
/* leave tbp held (from buf_Get) */
if (!reserving)
***************
*** 1013,1021 ****
/* add the buffer to the list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, tbp);
! osi_QAdd((osi_queue_t **)&biop->bufListp, &qdp->q);
! if (!biop->bufListEndp)
! biop->bufListEndp = qdp;
buf_Hold(tbp);
/* from now on, a failure just stops our collection process, but
--- 1014,1022 ----
/* add the buffer to the list */
qdp = osi_QDAlloc();
osi_SetQData(qdp, tbp);
! osi_QAddH((osi_queue_t **)&biop->bufListp,
! (osi_queue_t **)&biop->bufListEndp,
! &qdp->q);
buf_Hold(tbp);
/* from now on, a failure just stops our collection process, but
***************
*** 1032,1037 ****
--- 1033,1041 ----
for (qdp = heldBufListp; qdp; qdp = tqdp) {
tqdp = (osi_queueData_t *) osi_QNext(&qdp->q);
tbp = osi_GetQData(qdp);
+ osi_QRemoveHT((osi_queue_t **) &heldBufListp,
+ (osi_queue_t **) &heldBufListEndp,
+ &qdp->q);
osi_QDFree(qdp);
buf_Release(tbp);
}
***************
*** 1084,1089 ****
--- 1088,1096 ----
/* extract buffer and free queue data */
bufp = osi_GetQData(qdp);
+ osi_QRemoveHT((osi_queue_t **) &biop->bufListp,
+ (osi_queue_t **) &biop->bufListEndp,
+ &qdp->q);
osi_QDFree(qdp);
/* now, mark I/O as done, unlock the buffer and release it */
Index: openafs/src/WINNT/afsd/smb.c
diff -c openafs/src/WINNT/afsd/smb.c:1.55.2.61 openafs/src/WINNT/afsd/smb.c:1.55.2.62
*** openafs/src/WINNT/afsd/smb.c:1.55.2.61 Tue Jun 6 12:58:50 2006
--- openafs/src/WINNT/afsd/smb.c Thu Aug 3 19:29:43 2006
***************
*** 143,149 ****
int smb_useV3; /* try to negotiate V3 */
#ifndef DJGPP
! static showErrors = 1;
/* MessageBox or something like it */
int (_stdcall *smb_MBfunc)(HWND, LPCTSTR, LPCTSTR, UINT) = NULL;
#endif /* DJGPP */
--- 143,149 ----
int smb_useV3; /* try to negotiate V3 */
#ifndef DJGPP
! static showErrors = 0;
/* MessageBox or something like it */
int (_stdcall *smb_MBfunc)(HWND, LPCTSTR, LPCTSTR, UINT) = NULL;
#endif /* DJGPP */
***************
*** 8191,8198 ****
if (showErrors)
code = (*smb_MBfunc)(NULL, tbuffer, "AFS Client Service: Fatal Error",
MB_OK|MB_SERVICE_NOTIFICATION);
! osi_assert(tbuffer);
! ExitThread(1);
#else
fprintf(stderr, "NCBLISTEN lana=%d failed with code %d\n",
ncbp->ncb_lana_num, code);
--- 8191,8197 ----
if (showErrors)
code = (*smb_MBfunc)(NULL, tbuffer, "AFS Client Service: Fatal Error",
MB_OK|MB_SERVICE_NOTIFICATION);
! osi_panic(tbuffer, __FILE__, __LINE__);
#else
fprintf(stderr, "NCBLISTEN lana=%d failed with code %d\n",
ncbp->ncb_lana_num, code);
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm
diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.1.24.4 openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.1.24.5
*** openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm:1.1.24.4 Thu Jul 6 21:15:19 2006
--- openafs/src/WINNT/doc/install/Documentation/en_US/html/index.htm Mon Aug 21 01:00:49 2006
***************
*** 198,204 ****
OpenAFS for Windows
! Version 1.4.0
--- 198,204 ----
OpenAFS for Windows
! Version 1.4.2
Index: openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm
diff -c openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.10 openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.11
*** openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm:1.2.2.10 Thu Jul 6 21:15:30 2006
--- openafs/src/WINNT/doc/install/Documentation/en_US/html/ReleaseNotes/relnotes.htm Mon Aug 21 01:00:55 2006
***************
*** 3,9 ****
! OpenAFS for Windows 1.4.1 Release Notes