DEVEL15-windows-cleanup-20060627

 * fix UAEACCES debug string

 * assign scachetype invalid when invalid

 * smb_WriteData prototype

 * update T2 search dir debug message to include unique

(cherry picked from commit f2c64e15995abc6791923013805cca402e6f4e8e)

diff --git a/src/WINNT/afsd/cm_conn.c b/src/WINNT/afsd/cm_conn.c
index 57563e8d3782d1cd94f41456a41f17f7311e1f92..1962efeae460259272a405b296f965dd1f0b0eaf 100644 (file)
--- a/src/WINNT/afsd/cm_conn.c
+++ b/src/WINNT/afsd/cm_conn.c
@@ -522,7 +522,7 @@ cm_Analyze(cm_conn_t *connp, cm_user_t *userp, cm_req_t *reqp,
             case EINVAL            : s = "EINVAL";             break;
            case UAEINVAL          : s = "UAEINVAL";           break;
             case EACCES            : s = "EACCES";             break;
-           case UAEACCES          : s = "UAECCES";            break;
+           case UAEACCES          : s = "UAEACCES";           break;
            case ENOENT            : s = "ENOENT";             break;
            case UAENOENT          : s = "UAENOENT";           break;
            case CM_ERROR_NOSUCHCELL        : s = "CM_ERROR_NOSUCHCELL";         break;                         

diff --git a/src/WINNT/afsd/cm_scache.c b/src/WINNT/afsd/cm_scache.c
index 1d772c12793f806cb60cc763e50518e470d44dc2..409e3b386dadcfc1a3b40a4e158c728127e1b3b2 100644 (file)
--- a/src/WINNT/afsd/cm_scache.c
+++ b/src/WINNT/afsd/cm_scache.c
@@ -1246,7 +1246,7 @@ void cm_MergeStatus(cm_scache_t *scp, AFSFetchStatus *statusp, AFSVolSync *volp,
     }       
     else {
         osi_Log1(afsd_logp, "Merge, Invalid File Type, scp %x", scp);
-        scp->fileType = 0;     /* invalid */
+        scp->fileType = CM_SCACHETYPE_INVALID; /* invalid */
     }
     /* and other stuff */
     scp->parentVnode = statusp->ParentVnode;

diff --git a/src/WINNT/afsd/smb.h b/src/WINNT/afsd/smb.h
index 37b1fafb6118c3116bfd6b9e3dad7d7ed645bc6f..dfdd7ee3e880843da378f05be0f04d991de2f840 100644 (file)
--- a/src/WINNT/afsd/smb.h
+++ b/src/WINNT/afsd/smb.h
@@ -683,6 +683,14 @@ extern unsigned char *smb_ParseVblBlock(unsigned char *inp, char **chainpp, int
 
 extern int smb_SUser(cm_user_t *userp);
 
+#ifndef DJGPP
+long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, long count, char *op,
+       cm_user_t *userp, long *writtenp);
+#else /* DJGPP */
+long smb_WriteData(smb_fid_t *fidp, osi_hyper_t *offsetp, long count, char *op,
+       cm_user_t *userp, long *writtenp, int dosflag);
+#endif /* !DJGPP */
+
 #ifndef DJGPP
 extern long smb_ReadData(smb_fid_t *fidp, osi_hyper_t *offsetp, long count,
        char *op, cm_user_t *userp, long *readp);

diff --git a/src/WINNT/afsd/smb3.c b/src/WINNT/afsd/smb3.c
index d66877e0c22f50b4087fc85dc99ea577265b5ef7..e1d2d3dcb025ae276cbe4a65f5c7a934258883e7 100644 (file)
--- a/src/WINNT/afsd/smb3.c
+++ b/src/WINNT/afsd/smb3.c
@@ -4247,8 +4247,9 @@ long smb_ReceiveTran2SearchDir(smb_vc_t *vcp, smb_tran2Packet_t *p, smb_packet_t
             NeedShortName = 1;
         }
 
-        osi_Log3(smb_logp, "T2 search dir vn %u name %s (%s)",
-                  dep->fid.vnode, osi_LogSaveString(smb_logp, dep->name),
+        osi_Log4(smb_logp, "T2 search dir vn %u uniq %u name %s (%s)",
+                  dep->fid.vnode, dep->fid.unique, 
+                 osi_LogSaveString(smb_logp, dep->name),
                   NeedShortName ? osi_LogSaveString(smb_logp, shortName) : "");
 
         /* When matching, we are using doing a case fold if we have a wildcard mask.
@@ -5263,7 +5264,6 @@ long smb_ReceiveV3WriteX(smb_vc_t *vcp, smb_packet_t *inp, smb_packet_t *outp)
     smb_fid_t *fidp;
     long code = 0;
     cm_user_t *userp;
-    cm_attr_t truncAttr;       /* attribute struct used for truncating file */
     char *op;
     int inDataBlockCount;