hidedots-fix-20040228

* Fix the Hiding of dot files.  attributes were computed but never applied
  due to typo during merge

* Prevent crashing during service shutdown by power management thread

diff --git a/src/WINNT/afsd/afsd_flushvol.c b/src/WINNT/afsd/afsd_flushvol.c
index d3abfbd..4ba3971 100644 (file)
--- a/src/WINNT/afsd/afsd_flushvol.c
+++ b/src/WINNT/afsd/afsd_flushvol.c
@@ -341,6 +341,7 @@ afsd_ServiceFlushVolumesThreadProc(LPVOID lpParam)
                case WAIT_OBJECT_0:
                        // termination signaled
                        RevertToSelf();
+                       Sleep(500);
                        ExitThread(0);
                        break;
 

diff --git a/src/WINNT/afsd/cm_buf.c b/src/WINNT/afsd/cm_buf.c
index cf36cbd..4d5a60b 100644 (file)
--- a/src/WINNT/afsd/cm_buf.c
+++ b/src/WINNT/afsd/cm_buf.c
@@ -1420,6 +1420,9 @@ int cm_DumpBufHashTable(FILE *outputFile, char *cookie)
     char output[1024];
     int i;
   
+       if (buf_hashTablepp == NULL)
+               return -1;
+
     lock_ObtainRead(&buf_globalLock);
   
     sprintf(output, "%s - dumping buf_HashTable - buf_hashSize=%d\n", cookie, buf_hashSize);

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index 4fb7f04..92565af 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -1661,10 +1661,10 @@ long smb_ApplyV3DirListPatches(cm_scache_t *dscp,
 
                        /* Copy attributes */
                        lattr = smb_ExtAttributes(scp);
-                       *((u_long *)dptr) = lattr;
             /* merge in hidden (dot file) attribute */
                        if( patchp->flags & SMB_DIRLISTPATCH_DOTFILE )
                                lattr |= SMB_ATTR_HIDDEN;
+                       *((u_long *)dptr) = lattr;
                        dptr += 4;
                }
                else {