STABLE14-windows-getvolstatus-20060408

don't prevent all calls to getvolstatus, just the ones that are
not AFS pioctl calls.

(cherry picked from commit 632d0c701b31877b4d74f5f3849a5a8054f7326a)

diff --git a/src/WINNT/afsd/cm_ioctl.c b/src/WINNT/afsd/cm_ioctl.c
index f50472a6b2bc6f157b4f19744ce2c95466db5037..c07834209b15a82d949b700a7f8f2e086b9c7d3b 100644 (file)
--- a/src/WINNT/afsd/cm_ioctl.c
+++ b/src/WINNT/afsd/cm_ioctl.c
@@ -2200,6 +2200,11 @@ long cm_IoctlDelToken(struct smb_ioctl *ioctlp, struct cm_user *userp)
         free(ucellp->ticketp);
         ucellp->ticketp = NULL;
     }
+    ucellp->ticketLen = 0;
+    memset(ucellp->sessionKey.data, 0, 8);
+    ucellp->kvno = 0;
+    ucellp->expirationTime = 0;
+    ucellp->userName[0] = '\0';
     ucellp->flags &= ~CM_UCELLFLAG_RXKAD;
     ucellp->gen++;
 
@@ -2218,6 +2223,16 @@ long cm_IoctlDelAllToken(struct smb_ioctl *ioctlp, struct cm_user *userp)
 
     for (ucellp = userp->cellInfop; ucellp; ucellp = ucellp->nextp) {
         osi_Log1(smb_logp,"cm_IoctlDelAllToken ucellp %lx", ucellp);
+
+       if (ucellp->ticketp) {
+           free(ucellp->ticketp);
+           ucellp->ticketp = NULL;
+       }
+       ucellp->ticketLen = 0;
+       memset(ucellp->sessionKey.data, 0, 8);
+       ucellp->kvno = 0;
+       ucellp->expirationTime = 0;
+       ucellp->userName[0] = '\0';
         ucellp->flags &= ~CM_UCELLFLAG_RXKAD;
         ucellp->gen++;
     }

diff --git a/src/WINNT/afsd/smb_ioctl.c b/src/WINNT/afsd/smb_ioctl.c
index b9184d7297a1a672a1f8932fd2b7b81258756376..5d73103da9e86b9e81ad3a915d2e72d29fc5628c 100644 (file)
--- a/src/WINNT/afsd/smb_ioctl.c
+++ b/src/WINNT/afsd/smb_ioctl.c
@@ -40,14 +40,8 @@ void smb_InitIoctl(void)
     smb_ioctlProcsp[VIOCSETAL] = cm_IoctlSetACL;
     smb_ioctlProcsp[VIOC_FLUSHVOLUME] = cm_IoctlFlushVolume;
     smb_ioctlProcsp[VIOCFLUSH] = cm_IoctlFlushFile;
-#ifdef COMMENT
-    /* This functions do not return the data expected by the 
-     * Windows CIFS client.  Calling them only increases the 
-     * number of roundtrips to the file server with no benefit.
-     */
     smb_ioctlProcsp[VIOCSETVOLSTAT] = cm_IoctlSetVolumeStatus;
     smb_ioctlProcsp[VIOCGETVOLSTAT] = cm_IoctlGetVolumeStatus;
-#endif
     smb_ioctlProcsp[VIOCWHEREIS] = cm_IoctlWhereIs;
     smb_ioctlProcsp[VIOC_AFS_STAT_MT_PT] = cm_IoctlStatMountPoint;
     smb_ioctlProcsp[VIOC_AFS_DELETE_MT_PT] = cm_IoctlDeleteMountPoint;
@@ -122,7 +116,7 @@ void smb_SetupIoctlFid(smb_fid_t *fidp, cm_space_t *prefix)
 smb_IoctlPrepareRead(smb_fid_t *fidp, smb_ioctl_t *ioctlp, cm_user_t *userp)
 {
     long opcode;
-    smb_ioctlProc_t *procp;
+    smb_ioctlProc_t *procp = NULL;
     long code;
 
     if (ioctlp->flags & SMB_IOCTLFLAG_DATAIN) {
@@ -143,7 +137,11 @@ smb_IoctlPrepareRead(smb_fid_t *fidp, smb_ioctl_t *ioctlp, cm_user_t *userp)
             return CM_ERROR_TOOBIG;
 
         /* check for no such proc */
-        procp = smb_ioctlProcsp[opcode];
+       if (fidp->flags & SMB_FID_IOCTL)
+           procp = smb_ioctlProcsp[opcode];
+       else
+           procp = NULL;
+
         if (procp == NULL) 
             return CM_ERROR_BADOP;