Removed version number from file header.
[samba.git] / source / smbd / trans2.c
index 5a7a5c72cb1ce8fc24ab66a146c493f53313a1ad..86c6252297d944c2fd6a5160ff54391f532a3a9b 100644 (file)
@@ -1,8 +1,7 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 1.9.
+   Unix SMB/CIFS implementation.
    SMB transaction2 handling
-   Copyright (C) Jeremy Allison 1994-1998
+   Copyright (C) Jeremy Allison 1994-2001
 
    Extensively modified by Andrew Tridgell, 1995
 
@@ -23,7 +22,6 @@
 
 #include "includes.h"
 
-extern int DEBUGLEVEL;
 extern int Protocol;
 extern BOOL case_sensitive;
 extern int smb_read_error;
@@ -38,6 +36,7 @@ extern pstring global_myname;
   set correctly for the type of call.
   HACK ! Always assumes smb_setup field is zero.
 ****************************************************************************/
+
 static int send_trans2_replies(char *outbuf, int bufsize, char *params, 
                               int paramsize, char *pdata, int datasize)
 {
@@ -54,7 +53,7 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
   char *pp = params;
   char *pd = pdata;
   int params_sent_thistime, data_sent_thistime, total_sent_thistime;
-  int alignment_offset = 3;
+  int alignment_offset = 1; /* JRA. This used to be 3. Set to 1 to make netmon parse ok. */
   int data_alignment_offset = 0;
 
   /* Initially set the wcnt area to be 10 - this is true for all
@@ -65,7 +64,8 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
      the empty packet */
   if(params_to_send == 0 && data_to_send == 0)
   {
-    send_smb(smbd_server_fd(),outbuf);
+    if (!send_smb(smbd_server_fd(),outbuf))
+      exit_server("send_trans2_replies: send_smb failed.");
     return 0;
   }
 
@@ -160,7 +160,8 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
           params_to_send, data_to_send, paramsize, datasize));
 
     /* Send the packet */
-    send_smb(smbd_server_fd(),outbuf);
+    if (!send_smb(smbd_server_fd(),outbuf))
+               exit_server("send_trans2_replies: send_smb failed.");
 
     pp += params_sent_thistime;
     pd += data_sent_thistime;
@@ -180,10 +181,10 @@ static int send_trans2_replies(char *outbuf, int bufsize, char *params,
   return 0;
 }
 
-
 /****************************************************************************
-  reply to a TRANSACT2_OPEN
+ Reply to a TRANSACT2_OPEN.
 ****************************************************************************/
+
 static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf, 
                           int bufsize,  
                           char **pparams, char **ppdata)
@@ -216,7 +217,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf,
           fname,open_mode, open_attr, open_ofun, open_size));
 
   if (IS_IPC(conn)) {
-               return(ERROR(ERRSRV,ERRaccess));
+               return(ERROR_DOS(ERRSRV,ERRaccess));
   }
 
   /* XXXX we need to handle passed times, sattr and flags */
@@ -254,13 +255,13 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf,
   inode = sbuf.st_ino;
   if (fmode & aDIR) {
     close_file(fsp,False);
-    return(ERROR(ERRDOS,ERRnoaccess));
+    return(ERROR_DOS(ERRDOS,ERRnoaccess));
   }
 
   /* Realloc the size of parameters and data we will return */
   params       = Realloc(*pparams, 28);
   if( params == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return(ERROR_DOS(ERRDOS,ERRnomem));
   }
   *pparams     = params;
 
@@ -288,21 +289,121 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf,
 }
 
 /*********************************************************
-* Routine to check if a given string matches exactly.
-* as a special case a mask of "." does NOT match. That
-* is required for correct wildcard semantics
-* Case can be significant or not.
+ Routine to check if a given string matches exactly.
+ as a special case a mask of "." does NOT match. That
+ is required for correct wildcard semantics
+ Case can be significant or not.
 **********************************************************/
+
 static BOOL exact_match(char *str,char *mask, BOOL case_sig) 
 {
-       if (mask[0] == '.' && mask[1] == 0) return False;
-       if (case_sig) return strcmp(str,mask)==0;
+       if (mask[0] == '.' && mask[1] == 0)
+               return False;
+       if (case_sig)   
+               return strcmp(str,mask)==0;
        return strcasecmp(str,mask) == 0;
 }
 
+#if 0
+
+Not finished yet - jra.
+
+/****************************************************************************
+ Return the filetype for UNIX extensions.
+****************************************************************************/
+
+static uint32 unix_filetype(mode_t mode)
+{
+       if(S_ISREG(mode))
+               return UNIX_TYPE_FILE;
+       else if(S_ISDIR(mode))
+               return UNIX_TYPE_DIR;
+#ifdef S_ISLNK
+       else if(S_ISLNK(mode))
+               return UNIX_TYPE_SYMLINK;
+#endif
+#ifdef S_ISCHR
+       else if(S_ISCHR(mode))
+               return UNIX_TYPE_CHARDEV;
+#endif
+#ifdef S_ISBLK
+       else if(S_ISBLK(mode))
+               return UNIX_TYPE_BLKDEV;
+#endif
+#ifdef S_ISFIFO
+       else if(S_ISFIFO(mode))
+               return UNIX_TYPE_FIFO;
+#endif
+#ifdef S_ISSOCK
+       else if(S_ISSOCK(mode))
+               return UNIX_TYPE_SOCKET;
+#endif
+
+       DEBUG(0,("unix_filetype: unknown filetype %u", (unsigned)mode));
+       return UNIX_TYPE_UNKNOWN;
+}
+
 /****************************************************************************
 get a level dependent lanman2 dir entry.
Return the major devicenumber for UNIX extensions.
 ****************************************************************************/
+
+static uint32 unix_dev_major(SMB_DEV_T dev)
+{
+#if defined(HAVE_DEVICE_MAJOR_FN)
+       return (uint32)major(dev);
+#else
+       return (uint32)(dev >> 8);
+#endif
+}
+
+/****************************************************************************
+ Return the minor devicenumber for UNIX extensions.
+****************************************************************************/
+
+static uint32 unix_dev_minor(SMB_DEV_T dev)
+{
+#if defined(HAVE_DEVICE_MINOR_FN)
+       return (uint32)minor(dev);
+#else
+       return (uint32)(dev & 0xff);
+#endif
+}
+
+/****************************************************************************
+ Map standard UNIX permissions onto wire representations.
+****************************************************************************/
+
+static uint32  unix_perms_to_wire(mode_t perms)
+{
+       uint ret = 0;
+
+       ret |= ((perms & S_IXOTH) ?  UNIX_X_OTH : 0);
+       ret |= ((perms & S_IWOTH) ?  UNIX_W_OTH : 0);
+       ret |= ((perms & S_IROTH) ?  UNIX_R_OTH : 0);
+       ret |= ((perms & S_IXGRP) ?  UNIX_X_GRP : 0);
+       ret |= ((perms & S_IWGRP) ?  UNIX_W_GRP : 0);
+       ret |= ((perms & S_IRGRP) ?  UNIX_R_GRP : 0);
+       ret |= ((perms & S_IXUSR) ?  UNIX_X_USR : 0);
+       ret |= ((perms & S_IWUSR) ?  UNIX_W_USR : 0);
+       ret |= ((perms & S_IRUSR) ?  UNIX_R_USR : 0);
+#ifdef S_ISVTX
+       ret |= ((perms & S_ISVTX) ?  UNIX_STICKY : 0);
+#endif
+#ifdef S_ISGID
+       ret |= ((perms & S_ISGID) ?  UNIX_SET_GID : 0);
+#endif
+#ifdef S_ISUID
+       ret |= ((perms & S_ISVTX) ?  UNIX_SET_UID : 0);
+#endif
+       return ret;
+}
+
+#endif
+
+/****************************************************************************
+ Get a level dependent lanman2 dir entry.
+****************************************************************************/
+
 static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                  void *inbuf, void *outbuf,
                                 char *path_mask,int dirtype,int info_level,
@@ -312,342 +413,368 @@ static BOOL get_lanman2_dir_entry(connection_struct *conn,
                                 BOOL *out_of_space, BOOL *got_exact_match,
                                 int *last_name_off)
 {
-  char *dname;
-  BOOL found = False;
-  SMB_STRUCT_STAT sbuf;
-  pstring mask;
-  pstring pathreal;
-  pstring fname;
-  char *p, *q, *pdata = *ppdata;
-  uint32 reskey=0;
-  int prev_dirpos=0;
-  int mode=0;
-  SMB_OFF_T size = 0;
-  uint32 len;
-  time_t mdate=0, adate=0, cdate=0;
-  char *nameptr;
-  BOOL was_8_3;
-  int nt_extmode; /* Used for NT connections instead of mode */
-  BOOL needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
-
-  *fname = 0;
-  *out_of_space = False;
-  *got_exact_match = False;
-
-  if (!conn->dirptr)
-    return(False);
-
-  p = strrchr(path_mask,'/');
-  if(p != NULL)
-  {
-    if(p[1] == '\0')
-      pstrcpy(mask,"*.*");
-    else
-      pstrcpy(mask, p+1);
-  }
-  else
-    pstrcpy(mask, path_mask);
-
-  while (!found)
-  {
-    BOOL got_match;
+       char *dname;
+       BOOL found = False;
+       SMB_STRUCT_STAT sbuf;
+       pstring mask;
+       pstring pathreal;
+       pstring fname;
+       char *p, *q, *pdata = *ppdata;
+       uint32 reskey=0;
+       int prev_dirpos=0;
+       int mode=0;
+       SMB_OFF_T size = 0;
+       SMB_OFF_T allocation_size = 0;
+       uint32 len;
+       time_t mdate=0, adate=0, cdate=0;
+       char *nameptr;
+       BOOL was_8_3;
+       int nt_extmode; /* Used for NT connections instead of mode */
+       BOOL needslash = ( conn->dirpath[strlen(conn->dirpath) -1] != '/');
+
+       *fname = 0;
+       *out_of_space = False;
+       *got_exact_match = False;
+
+       if (!conn->dirptr)
+               return(False);
+
+       p = strrchr_m(path_mask,'/');
+       if(p != NULL) {
+               if(p[1] == '\0')
+                       pstrcpy(mask,"*.*");
+               else
+                       pstrcpy(mask, p+1);
+       } else
+               pstrcpy(mask, path_mask);
+
+       while (!found) {
+               BOOL got_match;
+
+               /* Needed if we run out of space */
+               prev_dirpos = TellDir(conn->dirptr);
+               dname = ReadDirName(conn->dirptr);
 
-    /* Needed if we run out of space */
-    prev_dirpos = TellDir(conn->dirptr);
-    dname = ReadDirName(conn->dirptr);
-
-    /*
-     * Due to bugs in NT client redirectors we are not using
-     * resume keys any more - set them to zero.
-     * Check out the related comments in findfirst/findnext.
-     * JRA.
-     */
+               /*
+                * Due to bugs in NT client redirectors we are not using
+                * resume keys any more - set them to zero.
+                * Check out the related comments in findfirst/findnext.
+                * JRA.
+                */
 
-    reskey = 0;
+               reskey = 0;
 
-    DEBUG(8,("get_lanman2_dir_entry:readdir on dirptr 0x%lx now at offset %d\n",
-      (long)conn->dirptr,TellDir(conn->dirptr)));
+               DEBUG(8,("get_lanman2_dir_entry:readdir on dirptr 0x%lx now at offset %d\n",
+                       (long)conn->dirptr,TellDir(conn->dirptr)));
       
-    if (!dname) 
-      return(False);
+               if (!dname) 
+                       return(False);
 
-    pstrcpy(fname,dname);      
+               pstrcpy(fname,dname);      
 
-    if(!(got_match = *got_exact_match = exact_match(fname, mask, case_sensitive))) {
-        got_match = mask_match(fname, mask, case_sensitive);
-    }
+               if(!(got_match = *got_exact_match = exact_match(fname, mask, case_sensitive)))
+                       got_match = mask_match(fname, mask, case_sensitive);
 
-    if(!got_match && !is_8_3(fname, False)) {
+               if(!got_match && !is_8_3(fname, False)) {
 
-      /*
-       * It turns out that NT matches wildcards against
-       * both long *and* short names. This may explain some
-       * of the wildcard wierdness from old DOS clients
-       * that some people have been seeing.... JRA.
-       */
+                       /*
+                        * It turns out that NT matches wildcards against
+                        * both long *and* short names. This may explain some
+                        * of the wildcard wierdness from old DOS clients
+                        * that some people have been seeing.... JRA.
+                        */
 
-      pstring newname;
-      pstrcpy( newname, fname);
-      name_map_mangle( newname, True, False, SNUM(conn));
-      if(!(got_match = *got_exact_match = exact_match(newname, mask, case_sensitive)))
-        got_match = mask_match(newname, mask, case_sensitive);
-    }
+                       pstring newname;
+                       pstrcpy( newname, fname);
+                       name_map_mangle( newname, True, False, SNUM(conn));
+                       if(!(got_match = *got_exact_match = exact_match(newname, mask, case_sensitive)))
+                               got_match = mask_match(newname, mask, case_sensitive);
+               }
 
-    if(got_match)
-    {
-      BOOL isdots = (strequal(fname,"..") || strequal(fname,"."));
-      if (dont_descend && !isdots)
-        continue;
+               if(got_match) {
+                       BOOL isdots = (strequal(fname,"..") || strequal(fname,"."));
+                       if (dont_descend && !isdots)
+                               continue;
          
-      pstrcpy(pathreal,conn->dirpath);
-      if(needslash)
-        pstrcat(pathreal,"/");
-      pstrcat(pathreal,dname);
-      if (vfs_stat(conn,pathreal,&sbuf) != 0) 
-      {
-       /* Needed to show the msdfs symlinks as directories */
-       if(!lp_host_msdfs() || !lp_msdfs_root(SNUM(conn)) 
-          || !is_msdfs_link(conn, pathreal))
-         {
-           DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",
-                    pathreal,strerror(errno)));
-           continue;
-         }
-       else
-         {
-           DEBUG(5,("get_lanman2_dir_entry: Masquerading msdfs link %s as a directory\n", pathreal));
-           sbuf.st_mode = (sbuf.st_mode & 0xFFF) | S_IFDIR;
-         }
-      }
+                       pstrcpy(pathreal,conn->dirpath);
+                       if(needslash)
+                               pstrcat(pathreal,"/");
+                       pstrcat(pathreal,dname);
+
+                       if (INFO_LEVEL_IS_UNIX(info_level)) {
+                               if (vfs_lstat(conn,pathreal,&sbuf) != 0) {
+                                       DEBUG(5,("get_lanman2_dir_entry:Couldn't lstat [%s] (%s)\n",
+                                               pathreal,strerror(errno)));
+                                       continue;
+                               }
+                       } else if (vfs_stat(conn,pathreal,&sbuf) != 0) {
+                               /* Needed to show the msdfs symlinks as directories */
+                               if(!lp_host_msdfs() || !lp_msdfs_root(SNUM(conn)) 
+                                               || !is_msdfs_link(conn, pathreal)) {
+                                       DEBUG(5,("get_lanman2_dir_entry:Couldn't stat [%s] (%s)\n",
+                                                       pathreal,strerror(errno)));
+                                       continue;
+                               } else {
+                                       DEBUG(5,("get_lanman2_dir_entry: Masquerading msdfs link %s as a directory\n",
+                                                       pathreal));
+                                       sbuf.st_mode = (sbuf.st_mode & 0xFFF) | S_IFDIR;
+                               }
+                       }
 
-      mode = dos_mode(conn,pathreal,&sbuf);
+                       mode = dos_mode(conn,pathreal,&sbuf);
 
-      if (!dir_check_ftype(conn,mode,&sbuf,dirtype)) {
-        DEBUG(5,("[%s] attribs didn't match %x\n",fname,dirtype));
-        continue;
-      }
+                       if (!dir_check_ftype(conn,mode,&sbuf,dirtype)) {
+                               DEBUG(5,("[%s] attribs didn't match %x\n",fname,dirtype));
+                               continue;
+                       }
 
-      size = sbuf.st_size;
-      mdate = sbuf.st_mtime;
-      adate = sbuf.st_atime;
-      cdate = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
-      if(mode & aDIR)
-        size = 0;
+                       size = sbuf.st_size;
+                       allocation_size = SMB_ROUNDUP_ALLOCATION(sbuf.st_size);
+                       mdate = sbuf.st_mtime;
+                       adate = sbuf.st_atime;
+                       cdate = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
 
-      DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
+                       if (lp_dos_filetime_resolution(SNUM(conn))) {
+                               cdate &= ~1;
+                               mdate &= ~1;
+                               adate &= ~1;
+                       }
+
+                       if(mode & aDIR)
+                               size = 0;
+
+                       DEBUG(5,("get_lanman2_dir_entry found %s fname=%s\n",pathreal,fname));
          
-      found = True;
-    }
-  }
+                       found = True;
+               }
+       }
 
-  name_map_mangle(fname,False,True,SNUM(conn));
+       name_map_mangle(fname,False,True,SNUM(conn));
 
-  p = pdata;
-  nameptr = p;
+       p = pdata;
+       nameptr = p;
 
-  nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
+       nt_extmode = mode ? mode : FILE_ATTRIBUTE_NORMAL;
 
-  switch (info_level)
-  {
-    case 1:
-      if(requires_resume_key) {
-        SIVAL(p,0,reskey);
-        p += 4;
-      }
-      put_dos_date2(p,l1_fdateCreation,cdate);
-      put_dos_date2(p,l1_fdateLastAccess,adate);
-      put_dos_date2(p,l1_fdateLastWrite,mdate);
-      SIVAL(p,l1_cbFile,(uint32)size);
-      SIVAL(p,l1_cbFileAlloc,SMB_ROUNDUP(size,1024));
-      SSVAL(p,l1_attrFile,mode);
-      p += l1_achName;
-      nameptr = p;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SCVAL(p, -1, len);
-      p += len;
-      break;
+       switch (info_level) {
+               case 1:
+                       if(requires_resume_key) {
+                               SIVAL(p,0,reskey);
+                               p += 4;
+                       }
+                       put_dos_date2(p,l1_fdateCreation,cdate);
+                       put_dos_date2(p,l1_fdateLastAccess,adate);
+                       put_dos_date2(p,l1_fdateLastWrite,mdate);
+                       SIVAL(p,l1_cbFile,(uint32)size);
+                       SIVAL(p,l1_cbFileAlloc,(uint32)allocation_size);
+                       SSVAL(p,l1_attrFile,mode);
+                       p += l1_achName;
+                       nameptr = p;
+                       p += align_string(outbuf, p, 0);
+                       len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+                       SCVAL(nameptr, -1, len);
+                       p += len;
+                       break;
+
+               case 2:
+                       if(requires_resume_key) {
+                               SIVAL(p,0,reskey);
+                               p += 4;
+                       }
+                       put_dos_date2(p,l2_fdateCreation,cdate);
+                       put_dos_date2(p,l2_fdateLastAccess,adate);
+                       put_dos_date2(p,l2_fdateLastWrite,mdate);
+                       SIVAL(p,l2_cbFile,(uint32)size);
+                       SIVAL(p,l2_cbFileAlloc,(uint32)allocation_size);
+                       SSVAL(p,l2_attrFile,mode);
+                       SIVAL(p,l2_cbList,0); /* No extended attributes */
+                       p += l2_achName;
+                       nameptr = p;
+                       len = srvstr_push(outbuf, p, fname, -1, STR_NOALIGN);
+                       SCVAL(p, -1, len);
+                       p += len;
+                       *p++ = 0; /* craig from unisys pointed out we need this */
+                       break;
+
+               case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
+                       was_8_3 = is_8_3(fname, True);
+                       p += 4;
+                       SIVAL(p,0,reskey); p += 4;
+                       put_long_date(p,cdate); p += 8;
+                       put_long_date(p,adate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       SOFF_T(p,0,size);
+                       SOFF_T(p,8,allocation_size);
+                       p += 16;
+                       SIVAL(p,0,nt_extmode); p += 4;
+                       q = p; p += 4;
+                       SIVAL(p,0,0); p += 4;
+                       if (!was_8_3) {
+                               pstring mangled_name;
+                               pstrcpy(mangled_name, fname);
+                               name_map_mangle(mangled_name,True,True,SNUM(conn));
+                               mangled_name[12] = 0;
+                               len = srvstr_push(outbuf, p+2, mangled_name, 24, STR_UPPER);
+                               SSVAL(p, 0, len);
+                       } else {
+                               SSVAL(p,0,0);
+                               *(p+2) = 0;
+                       }
+                       p += 2 + 24;
+                       len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+                       SIVAL(q,0,len);
+                       p += len;
+                       len = PTR_DIFF(p, pdata);
+                       len = (len + 3) & ~3;
+                       SIVAL(pdata,0,len);
+                       p = pdata + len;
+                       break;
+
+               case SMB_FIND_FILE_DIRECTORY_INFO:
+                       p += 4;
+                       SIVAL(p,0,reskey); p += 4;
+                       put_long_date(p,cdate); p += 8;
+                       put_long_date(p,adate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       SOFF_T(p,0,size);
+                       SOFF_T(p,8,allocation_size);
+                       p += 16;
+                       SIVAL(p,0,nt_extmode); p += 4;
+                       p += 4;
+                       len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+                       SIVAL(p, -4, len);
+                       p += len;
+                       len = PTR_DIFF(p, pdata);
+                       len = (len + 3) & ~3;
+                       SIVAL(pdata,0,len);
+                       p = pdata + len;
+                       break;
+      
+               case SMB_FIND_FILE_FULL_DIRECTORY_INFO:
+                       p += 4;
+                       SIVAL(p,0,reskey); p += 4;
+                       put_long_date(p,cdate); p += 8;
+                       put_long_date(p,adate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       put_long_date(p,mdate); p += 8;
+                       SOFF_T(p,0,size); 
+                       SOFF_T(p,8,allocation_size);
+                       p += 16;
+                       SIVAL(p,0,nt_extmode); p += 4;
+                       p += 4;
+                       SIVAL(p,0,0); p += 4;
+
+                       len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+                       SIVAL(p, -4, len);
+                       p += len;
+
+                       len = PTR_DIFF(p, pdata);
+                       len = (len + 3) & ~3;
+                       SIVAL(pdata,0,len);
+                       p = pdata + len;
+                       break;
+
+               case SMB_FIND_FILE_NAMES_INFO:
+                       p += 4;
+                       SIVAL(p,0,reskey); p += 4;
+                       p += 4;
+                       len = srvstr_push(outbuf, p, fname, -1, STR_TERMINATE);
+                       SIVAL(p, -4, len);
+                       p += len;
+                       len = PTR_DIFF(p, pdata);
+                       len = (len + 3) & ~3;
+                       SIVAL(pdata,0,len);
+                       p = pdata + len;
+                       break;
+
+               /* CIFS UNIX Extension. */
+
+#if 0 /* JRA - FIXME - NEEDS UNICODE CONVERSION !!! */
+               case SMB_FIND_FILE_UNIX:
+
+                       len = 108+strlen(fname)+1;      /* (length of SMB_QUERY_FILE_UNIX_BASIC = 100)+4+4+strlen(fname)*/
+                                                       /* +1 to be sure to transmit the termination of fname */
+                       len = (len + 3) & ~3;
+
+                       SIVAL(p,0,len); p+= 4;       /* Offset from this structure to the beginning of the next one */
+                       SIVAL(p,0,reskey); p+= 4;    /* Used for continuing search. */
+
+                       /* Begin of SMB_QUERY_FILE_UNIX_BASIC */
+                       SOFF_T(p,0,sbuf.st_size);             /* File size 64 Bit */
+                       p+= 8;
+
+#if defined(HAVE_STAT_ST_BLOCKS) && defined(STAT_ST_BLOCKSIZE)
+                       SOFF_T(p,0,sbuf.st_blocks*STAT_ST_BLOCKSIZE); /* Number of bytes used on disk - 64 Bit */
+#else
+                       /* Can't get the value - fake it using size. */
+                       SOFF_T(p,0,sbuf.st_size);             /* Number of bytes used on disk - 64 Bit */
+#endif
+                       p+= 8;
 
-    case 2:
-      /* info_level 2 */
-      if(requires_resume_key) {
-        SIVAL(p,0,reskey);
-        p += 4;
-      }
-      put_dos_date2(p,l2_fdateCreation,cdate);
-      put_dos_date2(p,l2_fdateLastAccess,adate);
-      put_dos_date2(p,l2_fdateLastWrite,mdate);
-      SIVAL(p,l2_cbFile,(uint32)size);
-      SIVAL(p,l2_cbFileAlloc,SMB_ROUNDUP(size,1024));
-      SSVAL(p,l2_attrFile,mode);
-      SIVAL(p,l2_cbList,0); /* No extended attributes */
-      p += l2_achName;
-      nameptr = p;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SCVAL(p, -1, len);
-      p += len;
-      break;
+                       put_long_date(p,sbuf.st_ctime);       /* Creation Time 64 Bit */
+                       put_long_date(p+8,sbuf.st_atime);     /* Last access time 64 Bit */
+                       put_long_date(p+16,sbuf.st_mtime);    /* Last modification time 64 Bit */
+                       p+= 24;
 
-    case 3:
-      SIVAL(p,0,reskey);
-      put_dos_date2(p,4,cdate);
-      put_dos_date2(p,8,adate);
-      put_dos_date2(p,12,mdate);
-      SIVAL(p,16,(uint32)size);
-      SIVAL(p,20,SMB_ROUNDUP(size,1024));
-      SSVAL(p,24,mode);
-      SIVAL(p,26,4);
-      p += 31;
-      nameptr = p;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SCVAL(p, -1, len);
-      p += len;
-      break;
+                       SIVAL(p,0,sbuf.st_uid);               /* user id for the owner */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
-    case 4:
-      if(requires_resume_key) {
-        SIVAL(p,0,reskey);
-        p += 4;
-      }
-      q = p;
-      put_dos_date2(p,4,cdate);
-      put_dos_date2(p,8,adate);
-      put_dos_date2(p,12,mdate);
-      SIVAL(p,16,(uint32)size);
-      SIVAL(p,20,SMB_ROUNDUP(size,1024));
-      SSVAL(p,24,mode);
-      p += 33;
-      nameptr = p;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SCVAL(p, -1, len);
-      p += len;
-      SIVAL(q,4,PTR_DIFF(p, q));
+                       SIVAL(p,0,sbuf.st_gid);               /* group id of owner */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
-      break;
+                       SIVAL(p,0,unix_filetype(sbuf.st_mode));
+                       p+= 4;
 
-    case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
-      was_8_3 = is_8_3(fname, True);
-      p += 4;
-      SIVAL(p,0,reskey); p += 4;
-      put_long_date(p,cdate); p += 8;
-      put_long_date(p,adate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      SOFF_T(p,0,size);
-      SOFF_T(p,8,size);
-      p += 16;
-      SIVAL(p,0,nt_extmode); p += 4;
-      q = p; p += 4;
-      SIVAL(p,0,0); p += 4;
-      if (!was_8_3) {
-             pstring mangled_name;
-             pstrcpy(mangled_name, fname);
-             name_map_mangle(mangled_name,True,True,SNUM(conn));
-             mangled_name[12] = 0;
-             len = srvstr_push(outbuf, p+2, mangled_name, 24, 
-                               STR_CONVERT|STR_UPPER);
-             SSVAL(p, 0, len);
-      } else {
-             SSVAL(p,0,0);
-             *(p+2) = 0;
-      }
-      p += 2 + 24;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SIVAL(q,0,len);
-      p += len;
-      len = PTR_DIFF(p, pdata);
-      len = (len + 3) & ~3;
-      SIVAL(pdata,0,len);
-      p = pdata + len;
-      break;
+                       SIVAL(p,0,unix_dev_major(sbuf.st_rdev));   /* Major device number if type is device */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
-    case SMB_FIND_FILE_DIRECTORY_INFO:
-      p += 4;
-      SIVAL(p,0,reskey); p += 4;
-      put_long_date(p,cdate); p += 8;
-      put_long_date(p,adate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      SOFF_T(p,0,size);
-      SOFF_T(p,8,size);
-      p += 16;
-      SIVAL(p,0,nt_extmode); p += 4;
-      p += 4;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SIVAL(p, -4, len);
-      p += len;
-      len = PTR_DIFF(p, pdata);
-      len = (len + 3) & ~3;
-      SIVAL(pdata,0,len);
-      p = pdata + len;
-      break;
-      
-      
-    case SMB_FIND_FILE_FULL_DIRECTORY_INFO:
-      p += 4;
-      SIVAL(p,0,reskey); p += 4;
-      put_long_date(p,cdate); p += 8;
-      put_long_date(p,adate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      put_long_date(p,mdate); p += 8;
-      SOFF_T(p,0,size); 
-      SOFF_T(p,8,size);
-      p += 16;
-      SIVAL(p,0,nt_extmode); p += 4;
-      p += 4;
-      SIVAL(p,0,0); p += 4;
-
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SIVAL(p, -4, len);
-      p += len;
-
-      len = PTR_DIFF(p, pdata);
-      len = (len + 3) & ~3;
-      SIVAL(pdata,0,len);
-      p = pdata + len;
-      break;
+                       SIVAL(p,0,unix_dev_minor(sbuf.st_rdev));   /* Minor device number if type is device */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
-    case SMB_FIND_FILE_NAMES_INFO:
-      p += 4;
-      SIVAL(p,0,reskey); p += 4;
-      p += 4;
-      len = srvstr_push(outbuf, p, fname, -1, 
-                       STR_TERMINATE|STR_CONVERT);
-      SIVAL(p, -4, len);
-      p += len;
-      len = PTR_DIFF(p, pdata);
-      len = (len + 3) & ~3;
-      SIVAL(pdata,0,len);
-      p = pdata + len;
-      break;
+                       SINO_T(p,0,(SMB_INO_T)sbuf.st_ino);   /* inode number */
+                       p+= 8;
 
-    default:      
-      return(False);
-    }
+                       SIVAL(p,0, unix_perms_to_wire(sbuf.st_mode));     /* Standard UNIX file permissions */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
+                       SIVAL(p,0,sbuf.st_nlink);             /* number of hard links */
+                       SIVAL(p,4,0);
+                       p+= 8;
 
-  if (PTR_DIFF(p,pdata) > space_remaining) {
-    /* Move the dirptr back to prev_dirpos */
-    SeekDir(conn->dirptr, prev_dirpos);
-    *out_of_space = True;
-    DEBUG(9,("get_lanman2_dir_entry: out of space\n"));
-    return False; /* Not finished - just out of space */
-  }
+                       /* End of SMB_QUERY_FILE_UNIX_BASIC */
+                       pstrcpy(p,fname);
+                       p=pdata+len;
 
-  /* Setup the last_filename pointer, as an offset from base_data */
-  *last_name_off = PTR_DIFF(nameptr,base_data);
-  /* Advance the data pointer to the next slot */
-  *ppdata = p;
+                       break;
+#endif
+
+               default:      
+                       return(False);
+       }
 
-  return(found);
+
+       if (PTR_DIFF(p,pdata) > space_remaining) {
+               /* Move the dirptr back to prev_dirpos */
+               SeekDir(conn->dirptr, prev_dirpos);
+               *out_of_space = True;
+               DEBUG(9,("get_lanman2_dir_entry: out of space\n"));
+               return False; /* Not finished - just out of space */
+       }
+
+       /* Setup the last_filename pointer, as an offset from base_data */
+       *last_name_off = PTR_DIFF(nameptr,base_data);
+       /* Advance the data pointer to the next slot */
+       *ppdata = p;
+
+       return(found);
 }
-  
 
 /****************************************************************************
  Reply to a TRANS2_FINDFIRST.
@@ -703,7 +830,7 @@ static int call_trans2findfirst(connection_struct *conn,
     case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
       break;
     default:
-      return(ERROR(ERRDOS,ERRunknownlevel));
+      return(ERROR_DOS(ERRDOS,ERRunknownlevel));
     }
 
   srvstr_pull(inbuf, directory, params+12, sizeof(directory), -1, STR_TERMINATE);
@@ -731,7 +858,7 @@ static int call_trans2findfirst(connection_struct *conn,
     return(UNIXERROR(ERRDOS,ERRbadpath));
   }
 
-  p = strrchr(directory,'/');
+  p = strrchr_m(directory,'/');
   if(p == NULL) {
     pstrcpy(mask,directory);
     pstrcpy(directory,"./");
@@ -744,15 +871,15 @@ static int call_trans2findfirst(connection_struct *conn,
 
   pdata        = Realloc(*ppdata, max_data_bytes + 1024);
   if( pdata == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return(ERROR_DOS(ERRDOS,ERRnomem));
   }
   *ppdata      = pdata;
   memset((char *)pdata,'\0',max_data_bytes + 1024);
 
   /* Realloc the params space */
   params = Realloc(*pparams, 10);
-  if( params == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
+  if (params == NULL) {
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *pparams     = params;
 
@@ -765,7 +892,7 @@ static int call_trans2findfirst(connection_struct *conn,
 
   if(!(wcard = strdup(mask))) {
     dptr_close(&dptr_num);
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
 
   dptr_set_wcard(dptr_num, wcard);
@@ -837,10 +964,9 @@ static int call_trans2findfirst(connection_struct *conn,
    * from observation of NT.
    */
 
-  if(numentries == 0)
-  {
-    dptr_close(&dptr_num);
-    return(ERROR(ERRDOS,ERRbadfile));
+  if(numentries == 0) {
+         dptr_close(&dptr_num);
+         return ERROR_DOS(ERRDOS,ERRbadfile);
   }
 
   /* At this point pdata points to numentries directory entries. */
@@ -875,10 +1001,10 @@ static int call_trans2findfirst(connection_struct *conn,
   return(-1);
 }
 
-
 /****************************************************************************
-  reply to a TRANS2_FINDNEXT
+ Reply to a TRANS2_FINDNEXT.
 ****************************************************************************/
+
 static int call_trans2findnext(connection_struct *conn, 
                               char *inbuf, char *outbuf, 
                               int length, int bufsize,
@@ -914,7 +1040,7 @@ static int call_trans2findnext(connection_struct *conn,
 
   *mask = *directory = *resume_name = 0;
 
-  srvstr_pull(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE|STR_CONVERT);
+  srvstr_pull(inbuf, resume_name, params+12, sizeof(resume_name), -1, STR_TERMINATE);
 
   DEBUG(3,("call_trans2findnext: dirhandle = %d, max_data_bytes = %d, maxentries = %d, \
 close_after_request=%d, close_if_end = %d requires_resume_key = %d \
@@ -934,12 +1060,12 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
     case SMB_FIND_FILE_BOTH_DIRECTORY_INFO:
       break;
     default:
-      return(ERROR(ERRDOS,ERRunknownlevel));
+      return ERROR_DOS(ERRDOS,ERRunknownlevel);
     }
 
   pdata = Realloc( *ppdata, max_data_bytes + 1024);
   if(pdata == NULL) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *ppdata      = pdata;
   memset((char *)pdata,'\0',max_data_bytes + 1024);
@@ -947,20 +1073,20 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
   /* Realloc the params space */
   params = Realloc(*pparams, 6*SIZEOFWORD);
   if( params == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *pparams     = params;
 
   /* Check that the dptr is valid */
   if(!(conn->dirptr = dptr_fetch_lanman2(dptr_num)))
-    return(ERROR(ERRDOS,ERRnofiles));
+    return ERROR_DOS(ERRDOS,ERRnofiles);
 
   string_set(&conn->dirpath,dptr_path(dptr_num));
 
   /* Get the wildcard mask from the dptr */
   if((p = dptr_wcard(dptr_num))== NULL) {
     DEBUG(2,("dptr_num %d has no wildcard\n", dptr_num));
-    return (ERROR(ERRDOS,ERRnofiles));
+    return ERROR_DOS(ERRDOS,ERRnofiles);
   }
   pstrcpy(mask, p);
   pstrcpy(directory,conn->dirpath);
@@ -1128,7 +1254,7 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
 }
 
 /****************************************************************************
-  reply to a TRANS2_QFSINFO (query filesystem info)
+ Reply to a TRANS2_QFSINFO (query filesystem info).
 ****************************************************************************/
 
 static int call_trans2qfsinfo(connection_struct *conn, 
@@ -1150,12 +1276,12 @@ static int call_trans2qfsinfo(connection_struct *conn,
 
   if(vfs_stat(conn,".",&st)!=0) {
     DEBUG(2,("call_trans2qfsinfo: stat of . failed (%s)\n", strerror(errno)));
-    return (ERROR(ERRSRV,ERRinvdevice));
+    return ERROR_DOS(ERRSRV,ERRinvdevice);
   }
 
   pdata = Realloc(*ppdata, max_data_bytes + 1024);
   if ( pdata == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *ppdata      = pdata;
   memset((char *)pdata,'\0',max_data_bytes + 1024);
@@ -1185,7 +1311,7 @@ static int call_trans2qfsinfo(connection_struct *conn,
             */
            SIVAL(pdata,0,str_checksum(lp_servicename(snum)) ^ (str_checksum(local_machine)<<16) );
            len = srvstr_push(outbuf, pdata+l2_vol_szVolLabel, vname, -1, 
-                             STR_TERMINATE|STR_CONVERT);
+                             STR_TERMINATE);
            SCVAL(pdata,l2_vol_cch,len);
            data_len = l2_vol_szVolLabel + len;
            DEBUG(5,("call_trans2qfsinfo : time = %x, namelen = %d, name = %s\n",
@@ -1194,16 +1320,17 @@ static int call_trans2qfsinfo(connection_struct *conn,
 
     case SMB_QUERY_FS_ATTRIBUTE_INFO:
            SIVAL(pdata,0,FILE_CASE_PRESERVED_NAMES|FILE_CASE_SENSITIVE_SEARCH|
-                 FILE_DEVICE_IS_MOUNTED|
-                 (lp_nt_acl_support() ? FILE_PERSISTENT_ACLS : 0)); /* FS ATTRIBUTES */
-           SIVAL(pdata,4,128); /* Max filename component length */
-           len = srvstr_push(outbuf, pdata+12, fstype, -1, STR_TERMINATE|STR_CONVERT);
+                 (lp_nt_acl_support(SNUM(conn)) ? FILE_PERSISTENT_ACLS : 0)); /* FS ATTRIBUTES */
+           SIVAL(pdata,4,255); /* Max filename component length */
+           /* NOTE! the fstype must *not* be null terminated or win98 won't recognise it
+              and will think we can't do long filenames */
+           len = srvstr_push(outbuf, pdata+12, fstype, -1, 0);
            SIVAL(pdata,8,len);
            data_len = 12 + len;
            break;
 
     case SMB_QUERY_FS_LABEL_INFO:
-           len = srvstr_push(outbuf, pdata+4, vname, -1, STR_TERMINATE|STR_CONVERT);
+           len = srvstr_push(outbuf, pdata+4, vname, -1, STR_TERMINATE);
            data_len = 4 + len;
            SIVAL(pdata,0,len);
            break;
@@ -1215,7 +1342,7 @@ static int call_trans2qfsinfo(connection_struct *conn,
            SIVAL(pdata,8,str_checksum(lp_servicename(snum)) ^ 
                  (str_checksum(local_machine)<<16));
 
-           len = srvstr_push(outbuf, pdata+18, vname, -1, STR_TERMINATE|STR_CONVERT);
+           len = srvstr_push(outbuf, pdata+18, vname, -1, STR_TERMINATE);
            SIVAL(pdata,12,len);
            data_len = 18+len;
            DEBUG(5,("call_trans2qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n", 
@@ -1249,7 +1376,7 @@ static int call_trans2qfsinfo(connection_struct *conn,
            }
            /* drop through */
   default:
-         return(ERROR(ERRDOS,ERRunknownlevel));
+         return ERROR_DOS(ERRDOS,ERRunknownlevel);
   }
 
 
@@ -1262,8 +1389,9 @@ static int call_trans2qfsinfo(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a TRANS2_SETFSINFO (set filesystem info)
+ Reply to a TRANS2_SETFSINFO (set filesystem info).
 ****************************************************************************/
+
 static int call_trans2setfsinfo(connection_struct *conn,
                                char *inbuf, char *outbuf, int length, 
                                int bufsize,
@@ -1275,7 +1403,7 @@ static int call_trans2setfsinfo(connection_struct *conn,
   DEBUG(3,("call_trans2setfsinfo\n"));
 
   if (!CAN_WRITE(conn))
-    return(ERROR(ERRSRV,ERRaccess));
+    return ERROR_DOS(ERRSRV,ERRaccess);
 
   outsize = set_message(outbuf,10,0,True);
 
@@ -1283,8 +1411,8 @@ static int call_trans2setfsinfo(connection_struct *conn,
 }
 
 /****************************************************************************
 Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
 file name or file id).
+ Reply to a TRANS2_QFILEPATHINFO or TRANSACT2_QFILEINFO (query file info by
+ file name or file id).
 ****************************************************************************/
 
 static int call_trans2qfilepathinfo(connection_struct *conn,
@@ -1293,759 +1421,907 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
                                    char **pparams,char **ppdata,
                                    int total_data)
 {
-  int max_data_bytes = SVAL(inbuf, smb_mdrcnt);
-  char *params = *pparams;
-  char *pdata = *ppdata;
-  uint16 tran_call = SVAL(inbuf, smb_setup0);
-  uint16 info_level;
-  int mode=0;
-  SMB_OFF_T size=0;
-  unsigned int data_size;
-  SMB_STRUCT_STAT sbuf;
-  pstring fname;
-  char *base_name;
-  char *p;
-  SMB_OFF_T pos = 0;
-  BOOL bad_path = False;
-  BOOL delete_pending = False;
-  int len;
-
-  if (tran_call == TRANSACT2_QFILEINFO) {
-         files_struct *fsp = file_fsp(params,0);
-         info_level = SVAL(params,2);
-
-         DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", 
-                  info_level));
-
-         if(fsp && (fsp->is_directory || fsp->stat_open)) {
-                 /*
-                  * This is actually a QFILEINFO on a directory
-                  * handle (returned from an NT SMB). NT5.0 seems
-                  * to do this call. JRA.
-                  */
-                 pstrcpy(fname, fsp->fsp_name);
-                 unix_convert(fname,conn,0,&bad_path,&sbuf);
-                 if (!check_name(fname,conn) || 
-                     (!VALID_STAT(sbuf) && vfs_stat(conn,fname,&sbuf))) {
-                         DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-                         if((errno == ENOENT) && bad_path) {
-                                 unix_ERR_class = ERRDOS;
-                                 unix_ERR_code = ERRbadpath;
-                         }
-                         return(UNIXERROR(ERRDOS,ERRbadpath));
-                 }
+       int max_data_bytes = SVAL(inbuf, smb_mdrcnt);
+       char *params = *pparams;
+       char *pdata = *ppdata;
+       uint16 tran_call = SVAL(inbuf, smb_setup0);
+       uint16 info_level;
+       int mode=0;
+       SMB_OFF_T size=0;
+       SMB_OFF_T allocation_size=0;
+       unsigned int data_size;
+       SMB_STRUCT_STAT sbuf;
+       pstring fname;
+       char *base_name;
+       char *p;
+       SMB_OFF_T pos = 0;
+       BOOL bad_path = False;
+       BOOL delete_pending = False;
+       int len;
+       time_t c_time;
+
+       if (tran_call == TRANSACT2_QFILEINFO) {
+               files_struct *fsp = file_fsp(params,0);
+               info_level = SVAL(params,2);
+
+               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QFILEINFO: level = %d\n", info_level));
+
+               if(fsp && (fsp->is_directory || fsp->stat_open)) {
+                       /*
+                        * This is actually a QFILEINFO on a directory
+                        * handle (returned from an NT SMB). NT5.0 seems
+                        * to do this call. JRA.
+                        */
+                       pstrcpy(fname, fsp->fsp_name);
+                       unix_convert(fname,conn,0,&bad_path,&sbuf);
+                       if (!check_name(fname,conn) || 
+                                       (!VALID_STAT(sbuf) && vfs_stat(conn,fname,&sbuf))) {
+                               DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
+                               if((errno == ENOENT) && bad_path) {
+                                       unix_ERR_class = ERRDOS;
+                                       unix_ERR_code = ERRbadpath;
+                               }
+                               return(UNIXERROR(ERRDOS,ERRbadpath));
+                       }
                  
-                 delete_pending = fsp->directory_delete_on_close;
-         } else {
-                 /*
-                  * Original code - this is an open file.
-                  */
-                 CHECK_FSP(fsp,conn);
-                 CHECK_ERROR(fsp);
-
-                 pstrcpy(fname, fsp->fsp_name);
-                 if (vfs_fstat(fsp,fsp->fd,&sbuf) != 0) {
-                         DEBUG(3,("fstat of fnum %d failed (%s)\n",
-                                  fsp->fnum, strerror(errno)));
-                         return(UNIXERROR(ERRDOS,ERRbadfid));
-                 }
-                 if((pos = fsp->conn->vfs_ops.lseek(fsp,fsp->fd,0,SEEK_CUR)) == -1)
-                         return(UNIXERROR(ERRDOS,ERRnoaccess));
-
-                 delete_pending = fsp->delete_on_close;
-         }
-  } else {
-         /* qpathinfo */
-         info_level = SVAL(params,0);
-
-         DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", 
-                  info_level));
-
-         srvstr_pull(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE);
-
-         RESOLVE_DFSPATH(fname, conn, inbuf, outbuf);
-
-         unix_convert(fname,conn,0,&bad_path,&sbuf);
-         if (!check_name(fname,conn) || 
-             (!VALID_STAT(sbuf) && vfs_stat(conn,fname,&sbuf))) {
-                 DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-                 if((errno == ENOENT) && bad_path) {
-                         unix_ERR_class = ERRDOS;
-                         unix_ERR_code = ERRbadpath;
-                 }
-                 return(UNIXERROR(ERRDOS,ERRbadpath));
-         }
-  }
-
+                       delete_pending = fsp->directory_delete_on_close;
+               } else {
+                       /*
+                        * Original code - this is an open file.
+                        */
+                       CHECK_FSP(fsp,conn);
+
+                       pstrcpy(fname, fsp->fsp_name);
+                       if (vfs_fstat(fsp,fsp->fd,&sbuf) != 0) {
+                               DEBUG(3,("fstat of fnum %d failed (%s)\n", fsp->fnum, strerror(errno)));
+                               return(UNIXERROR(ERRDOS,ERRbadfid));
+                       }
+                       if((pos = fsp->conn->vfs_ops.lseek(fsp,fsp->fd,0,SEEK_CUR)) == -1)
+                               return(UNIXERROR(ERRDOS,ERRnoaccess));
 
-  DEBUG(3,("call_trans2qfilepathinfo %s level=%d call=%d total_data=%d\n",
-          fname,info_level,tran_call,total_data));
+                       delete_pending = fsp->delete_on_close;
+               }
+       } else {
+               /* qpathinfo */
+               info_level = SVAL(params,0);
 
-  p = strrchr(fname,'/'); 
-  if (!p) {
-         base_name = fname;
-  } else {
-         base_name = p+1;
-  }
+               DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
-  mode = dos_mode(conn,fname,&sbuf);
-  size = sbuf.st_size;
-  if (mode & aDIR) size = 0;
+               srvstr_pull(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE);
 
-  params = Realloc(*pparams,2);
-  if (params == NULL) {
-         return(ERROR(ERRDOS,ERRnomem));
-  }
-  *pparams     = params;
-  memset((char *)params,'\0',2);
-  data_size = max_data_bytes + 1024;
-  pdata = Realloc(*ppdata, data_size); 
-  if ( pdata == NULL ) {
-    return(ERROR(ERRDOS,ERRnomem));
-  }
-  *ppdata = pdata;
+               RESOLVE_DFSPATH(fname, conn, inbuf, outbuf);
 
-  if (total_data > 0 && IVAL(pdata,0) == total_data) {
-    /* uggh, EAs for OS2 */
-    DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
-    return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED));
-  }
+               unix_convert(fname,conn,0,&bad_path,&sbuf);
+               if (!check_name(fname,conn) || 
+                               (!VALID_STAT(sbuf) && vfs_stat(conn,fname,&sbuf))) {
+                       DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
+                       if((errno == ENOENT) && bad_path) {
+                               unix_ERR_class = ERRDOS;
+                               unix_ERR_code = ERRbadpath;
+                       }
+                       return(UNIXERROR(ERRDOS,ERRbadpath));
+               }
+       }
 
-  memset((char *)pdata,'\0',data_size);
 
-  switch (info_level) 
-    {
-    case SMB_INFO_STANDARD:
-    case SMB_INFO_QUERY_EA_SIZE:
-      data_size = (info_level==1?22:26);
-      put_dos_date2(pdata,l1_fdateCreation,get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn))));
-      put_dos_date2(pdata,l1_fdateLastAccess,sbuf.st_atime);
-      put_dos_date2(pdata,l1_fdateLastWrite,sbuf.st_mtime); /* write time */
-      SIVAL(pdata,l1_cbFile,(uint32)size);
-      SIVAL(pdata,l1_cbFileAlloc,SMB_ROUNDUP(size,1024));
-      SSVAL(pdata,l1_attrFile,mode);
-      SIVAL(pdata,l1_attrFile+2,4); /* this is what OS2 does */
-      break;
+       DEBUG(3,("call_trans2qfilepathinfo %s level=%d call=%d total_data=%d\n",
+               fname,info_level,tran_call,total_data));
 
-    case SMB_INFO_QUERY_EAS_FROM_LIST:
-      data_size = 24;
-      put_dos_date2(pdata,0,get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn))));
-      put_dos_date2(pdata,4,sbuf.st_atime);
-      put_dos_date2(pdata,8,sbuf.st_mtime);
-      SIVAL(pdata,12,(uint32)size);
-      SIVAL(pdata,16,SMB_ROUNDUP(size,1024));
-      SIVAL(pdata,20,mode);
-      break;
+       p = strrchr_m(fname,'/'); 
+       if (!p)
+               base_name = fname;
+       else
+               base_name = p+1;
 
-    case SMB_INFO_QUERY_ALL_EAS:
-      data_size = 4;
-      SIVAL(pdata,0,data_size);
-      break;
+       mode = dos_mode(conn,fname,&sbuf);
+       size = sbuf.st_size;
+       allocation_size = SMB_ROUNDUP_ALLOCATION(sbuf.st_size);
+       
+       if (mode & aDIR)
+               size = 0;
+
+       params = Realloc(*pparams,2);
+       if (params == NULL)
+         return ERROR_DOS(ERRDOS,ERRnomem);
+       *pparams = params;
+       memset((char *)params,'\0',2);
+       data_size = max_data_bytes + 1024;
+       pdata = Realloc(*ppdata, data_size); 
+       if ( pdata == NULL )
+               return ERROR_DOS(ERRDOS,ERRnomem);
+       *ppdata = pdata;
+
+       if (total_data > 0 && IVAL(pdata,0) == total_data) {
+               /* uggh, EAs for OS2 */
+               DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
+               return ERROR_DOS(ERRDOS,ERReasnotsupported);
+       }
 
-    case 6:
-      return(ERROR(ERRDOS,ERRbadfunc)); /* os/2 needs this */      
+       memset((char *)pdata,'\0',data_size);
 
-    case SMB_QUERY_FILE_BASIC_INFO:
-      data_size = 36; /* w95 returns 40 bytes not 36 - why ?. */
-      put_long_date(pdata,get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn))));
-      put_long_date(pdata+8,sbuf.st_atime);
-      put_long_date(pdata+16,sbuf.st_mtime); /* write time */
-      put_long_date(pdata+24,sbuf.st_mtime); /* change time */
-      SIVAL(pdata,32,mode);
+       c_time = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
 
-      DEBUG(5,("SMB_QFBI - "));
-      {
-        time_t create_time = get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn)));
-        DEBUG(5,("create: %s ", ctime(&create_time)));
-      }
-      DEBUG(5,("access: %s ", ctime(&sbuf.st_atime)));
-      DEBUG(5,("write: %s ", ctime(&sbuf.st_mtime)));
-      DEBUG(5,("change: %s ", ctime(&sbuf.st_mtime)));
-      DEBUG(5,("mode: %x\n", mode));
+       if (lp_dos_filetime_resolution(SNUM(conn))) {
+               c_time &= ~1;
+               sbuf.st_atime &= ~1;
+               sbuf.st_mtime &= ~1;
+               sbuf.st_mtime &= ~1;
+       }
 
-      break;
+       switch (info_level) {
+               case SMB_INFO_STANDARD:
+               case SMB_INFO_QUERY_EA_SIZE:
+                       data_size = (info_level==1?22:26);
+                       put_dos_date2(pdata,l1_fdateCreation,c_time);
+                       put_dos_date2(pdata,l1_fdateLastAccess,sbuf.st_atime);
+                       put_dos_date2(pdata,l1_fdateLastWrite,sbuf.st_mtime); /* write time */
+                       SIVAL(pdata,l1_cbFile,(uint32)size);
+                       SIVAL(pdata,l1_cbFileAlloc,(uint32)allocation_size);
+                       SSVAL(pdata,l1_attrFile,mode);
+                       SIVAL(pdata,l1_attrFile+2,4); /* this is what OS2 does */
+                       break;
+
+               case SMB_INFO_QUERY_EAS_FROM_LIST:
+                       data_size = 24;
+                       put_dos_date2(pdata,0,c_time);
+                       put_dos_date2(pdata,4,sbuf.st_atime);
+                       put_dos_date2(pdata,8,sbuf.st_mtime);
+                       SIVAL(pdata,12,(uint32)size);
+                       SIVAL(pdata,16,(uint32)allocation_size);
+                       SIVAL(pdata,20,mode);
+                       break;
+
+               case SMB_INFO_QUERY_ALL_EAS:
+                       data_size = 4;
+                       SIVAL(pdata,0,data_size);
+                       break;
+
+               case 6:
+                       return ERROR_DOS(ERRDOS,ERRbadfunc); /* os/2 needs this */      
+
+               case SMB_FILE_BASIC_INFORMATION:
+               case SMB_QUERY_FILE_BASIC_INFO:
+
+                       if (info_level == SMB_QUERY_FILE_BASIC_INFO)
+                               data_size = 36; /* w95 returns 40 bytes not 36 - why ?. */
+                       else {
+                               data_size = 40;
+                               SIVAL(pdata,36,0);
+                       }
+                       put_long_date(pdata,c_time);
+                       put_long_date(pdata+8,sbuf.st_atime);
+                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
+                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       SIVAL(pdata,32,mode);
+
+                       DEBUG(5,("SMB_QFBI - "));
+                       {
+                               time_t create_time = c_time;
+                               DEBUG(5,("create: %s ", ctime(&create_time)));
+                       }
+                       DEBUG(5,("access: %s ", ctime(&sbuf.st_atime)));
+                       DEBUG(5,("write: %s ", ctime(&sbuf.st_mtime)));
+                       DEBUG(5,("change: %s ", ctime(&sbuf.st_mtime)));
+                       DEBUG(5,("mode: %x\n", mode));
+
+                       break;
+
+               case SMB_FILE_STANDARD_INFORMATION:
+               case SMB_QUERY_FILE_STANDARD_INFO:
+                       data_size = 24;
+                       /* Fake up allocation size. */
+                       SOFF_T(pdata,0,allocation_size);
+                       SOFF_T(pdata,8,size);
+                       SIVAL(pdata,16,sbuf.st_nlink);
+                       SCVAL(pdata,20,0);
+                       SCVAL(pdata,21,(mode&aDIR)?1:0);
+                       break;
+
+               case SMB_FILE_EA_INFORMATION:
+               case SMB_QUERY_FILE_EA_INFO:
+                       data_size = 4;
+                       break;
+
+               /* Get the 8.3 name - used if NT SMB was negotiated. */
+               case SMB_QUERY_FILE_ALT_NAME_INFO:
+               {
+                       pstring short_name;
+
+                       pstrcpy(short_name,base_name);
+                       /* Mangle if not already 8.3 */
+                       if(!is_8_3(short_name, True)) {
+                               if(!name_map_mangle(short_name,True,True,SNUM(conn)))
+                                       *short_name = '\0';
+                       }
+                       len = srvstr_push(outbuf, pdata+4, short_name, -1, STR_TERMINATE|STR_UPPER);
+                       data_size = 4 + len;
+                       SIVAL(pdata,0,len);
+                       break;
+               }
 
-    case SMB_QUERY_FILE_STANDARD_INFO:
-      data_size = 22;
-      SOFF_T(pdata,0,size);
-      SOFF_T(pdata,8,size);
-      SIVAL(pdata,16,sbuf.st_nlink);
-      CVAL(pdata,20) = 0;
-      CVAL(pdata,21) = (mode&aDIR)?1:0;
-      break;
+               case SMB_QUERY_FILE_NAME_INFO:
+                       /*
+                        * The first part of this code is essential
+                        * to get security descriptors to work on mapped
+                        * drives. Don't ask how I discovered this unless
+                        * you like hearing about me suffering.... :-). JRA.
+                        */
+                       if(strequal(".", fname)) {
+                               len = srvstr_push(outbuf, pdata+4, "\\", -1, STR_TERMINATE);
+                       } else {
+                               len = srvstr_push(outbuf, pdata+4, fname, -1, STR_TERMINATE);
+                       }
+                       data_size = 4 + len;
+                       SIVAL(pdata,0,len);
+                       break;
+
+               case SMB_FILE_END_OF_FILE_INFORMATION:
+               case SMB_QUERY_FILE_END_OF_FILEINFO:
+                       data_size = 8;
+                       SOFF_T(pdata,0,size);
+                       break;
+
+               case SMB_FILE_ALLOCATION_INFORMATION:
+               case SMB_QUERY_FILE_ALLOCATION_INFO:
+                       data_size = 8;
+                       SOFF_T(pdata,0,allocation_size);
+                       break;
+
+               case SMB_QUERY_FILE_ALL_INFO:
+                       put_long_date(pdata,c_time);
+                       put_long_date(pdata+8,sbuf.st_atime);
+                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
+                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       SIVAL(pdata,32,mode);
+                       pdata += 40;
+                       SOFF_T(pdata,0,allocation_size);
+                       SOFF_T(pdata,8,size);
+                       SIVAL(pdata,16,sbuf.st_nlink);
+                       SCVAL(pdata,20,delete_pending);
+                       SCVAL(pdata,21,(mode&aDIR)?1:0);
+                       pdata += 24;
+                       SINO_T(pdata,0,(SMB_INO_T)sbuf.st_ino); 
+                       pdata += 8; /* index number */
+                       pdata += 4; /* EA info */
+                       if (mode & aRONLY)
+                               SIVAL(pdata,0,0xA9);
+                       else
+                               SIVAL(pdata,0,0xd01BF);
+                       pdata += 4;
+                       SOFF_T(pdata,0,pos); /* current offset */
+                       pdata += 8;
+                       SIVAL(pdata,0,mode); /* is this the right sort of mode info? */
+                       pdata += 4;
+                       pdata += 4; /* alignment */
+                       len = srvstr_push(outbuf, pdata+4, fname, -1, STR_TERMINATE);
+                       SIVAL(pdata,0,len);
+                       pdata += 4 + len;
+                       data_size = PTR_DIFF(pdata,(*ppdata));
+                       break;
+
+               case SMB_FILE_INTERNAL_INFORMATION:
+                       /* This should be an index number - looks like dev/ino to me :-) */
+                       SIVAL(pdata,0,sbuf.st_dev);
+                       SIVAL(pdata,4,sbuf.st_ino);
+                       data_size = 8;
+                       break;
+
+               case SMB_FILE_ACCESS_INFORMATION:
+                       SIVAL(pdata,0,0x12019F); /* ??? */
+                       data_size = 4;
+                       break;
+
+               case SMB_FILE_NAME_INFORMATION:
+                       /* Pathname with leading '\'. */
+                       {
+                               pstring new_fname;
+                               size_t byte_len;
+
+                               pstrcpy(new_fname, "\\");
+                               pstrcat(new_fname, fname);
+                               byte_len = dos_PutUniCode(pdata+4,new_fname,max_data_bytes,False);
+                               SIVAL(pdata,0,byte_len);
+                               data_size = 4 + byte_len;
+                               break;
+                       }
 
-    case SMB_QUERY_FILE_EA_INFO:
-      data_size = 4;
-      break;
+               case SMB_FILE_DISPOSITION_INFORMATION:
+                       data_size = 1;
+                       SCVAL(pdata,0,delete_pending);
+                       break;
 
-    /* Get the 8.3 name - used if NT SMB was negotiated. */
-    case SMB_QUERY_FILE_ALT_NAME_INFO:
-      {
-        pstring short_name;
+               case SMB_FILE_POSITION_INFORMATION:
+                       data_size = 8;
+                       SOFF_T(pdata,0,pos);
+                       break;
 
-        pstrcpy(short_name,base_name);
-        /* Mangle if not already 8.3 */
-        if(!is_8_3(short_name, True))
-        {
-          if(!name_map_mangle(short_name,True,True,SNUM(conn)))
-            *short_name = '\0';
-        }
-       len = srvstr_push(outbuf, pdata+4, short_name, -1, 
-                         STR_TERMINATE|STR_CONVERT|STR_UPPER);
-        data_size = 4 + len;
-        SIVAL(pdata,0,len);
-      }
-      break;
+               case SMB_FILE_MODE_INFORMATION:
+                       SIVAL(pdata,0,mode);
+                       data_size = 4;
+                       break;
 
-    case SMB_QUERY_FILE_NAME_INFO:
-           /*
-            * The first part of this code is essential
-            * to get security descriptors to work on mapped
-            * drives. Don't ask how I discovered this unless
-            * you like hearing about me suffering.... :-). JRA.
-            */
-           if(strequal(".", fname)) {
-                   len = srvstr_push(outbuf, pdata+4, "\\", -1, STR_TERMINATE|STR_CONVERT);
-           } else {
-                   len = srvstr_push(outbuf, pdata+4, fname, -1, STR_TERMINATE|STR_CONVERT);
-           }
-           data_size = 4 + len;
-           SIVAL(pdata,0,len);
-           break;
+               case SMB_FILE_ALIGNMENT_INFORMATION:
+                       SIVAL(pdata,0,0); /* No alignment needed. */
+                       data_size = 4;
+                       break;
 
-    case SMB_QUERY_FILE_ALLOCATION_INFO:
-    case SMB_QUERY_FILE_END_OF_FILEINFO:
-           data_size = 8;
-           SOFF_T(pdata,0,size);
-           break;
+#if 0
+       /* Not yet finished... JRA */
+       case 1018:
+               {
+                       pstring new_fname;
+                       size_t byte_len;
+
+                       put_long_date(pdata,c_time);
+                       put_long_date(pdata+8,sbuf.st_atime);
+                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
+                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       SIVAL(pdata,32,mode);
+                       SIVAL(pdata,36,0); /* ??? */
+                       SIVAL(pdata,40,0x20); /* ??? */
+                       SIVAL(pdata,44,0); /* ??? */
+                       SOFF_T(pdata,48,size);
+                       SIVAL(pdata,56,0x1); /* ??? */
+                       SIVAL(pdata,60,0); /* ??? */
+                       SIVAL(pdata,64,0); /* ??? */
+                       SIVAL(pdata,68,length); /* Following string length in bytes. */
+                       dos_PutUniCode(pdata+72,,False);
+                       break;
+               }
+#endif
 
-    case SMB_QUERY_FILE_ALL_INFO:
-      put_long_date(pdata,get_create_time(&sbuf,lp_fake_dir_create_times(SNUM(conn))));
-      put_long_date(pdata+8,sbuf.st_atime);
-      put_long_date(pdata+16,sbuf.st_mtime); /* write time */
-      put_long_date(pdata+24,sbuf.st_mtime); /* change time */
-      SIVAL(pdata,32,mode);
-      pdata += 40;
-      SOFF_T(pdata,0,size);
-      SOFF_T(pdata,8,size);
-      SIVAL(pdata,16,sbuf.st_nlink);
-      CVAL(pdata,20) = delete_pending;
-      CVAL(pdata,21) = (mode&aDIR)?1:0;
-      pdata += 24;
-      SINO_T(pdata,0,(SMB_INO_T)sbuf.st_ino); 
-      pdata += 8; /* index number */
-      pdata += 4; /* EA info */
-      if (mode & aRONLY)
-        SIVAL(pdata,0,0xA9);
-      else
-        SIVAL(pdata,0,0xd01BF);
-      pdata += 4;
-      SOFF_T(pdata,0,pos); /* current offset */
-      pdata += 8;
-      SIVAL(pdata,0,mode); /* is this the right sort of mode info? */
-      pdata += 4;
-      pdata += 4; /* alignment */
-      len = srvstr_push(outbuf, pdata+4, fname, -1, STR_TERMINATE|STR_CONVERT);
-      SIVAL(pdata,0,len);
-      pdata += 4 + len;
-      data_size = PTR_DIFF(pdata,(*ppdata));
-      break;
+               case SMB_FILE_ALTERNATE_NAME_INFORMATION:
+                       /* Last component of pathname. */
+                       {
+                               size_t byte_len = dos_PutUniCode(pdata+4,fname,max_data_bytes,False);
+                               SIVAL(pdata,0,byte_len);
+                               data_size = 4 + byte_len;
+                               break;
+                       }
+               
+               case SMB_FILE_STREAM_INFORMATION:
+                       if (mode & aDIR) {
+                               data_size = 0;
+                       } else {
+                               size_t byte_len = dos_PutUniCode(pdata+24,"::$DATA", 0xE, False);
+                               SIVAL(pdata,0,0); /* ??? */
+                               SIVAL(pdata,4,byte_len); /* Byte length of unicode string ::$DATA */
+                               SOFF_T(pdata,8,size);
+                               SIVAL(pdata,16,allocation_size);
+                               SIVAL(pdata,20,0); /* ??? */
+                               data_size = 24 + byte_len;
+                       }
+                       break;
+
+               case SMB_FILE_COMPRESSION_INFORMATION:
+                       SOFF_T(pdata,0,size);
+                       SIVAL(pdata,8,0); /* ??? */
+                       SIVAL(pdata,12,0); /* ??? */
+                       data_size = 16;
+                       break;
+
+               case SMB_FILE_NETWORK_OPEN_INFORMATION:
+                       put_long_date(pdata,c_time);
+                       put_long_date(pdata+8,sbuf.st_atime);
+                       put_long_date(pdata+16,sbuf.st_mtime); /* write time */
+                       put_long_date(pdata+24,sbuf.st_mtime); /* change time */
+                       SIVAL(pdata,32,allocation_size);
+                       SOFF_T(pdata,40,size);
+                       SIVAL(pdata,48,mode);
+                       SIVAL(pdata,52,0); /* ??? */
+                       data_size = 56;
+                       break;
+
+               case SMB_FILE_ATTRIBUTE_TAG_INFORMATION:
+                       SIVAL(pdata,0,mode);
+                       SIVAL(pdata,4,0);
+                       data_size = 8;
+                       break;
 
 #if 0
-      /* NT4 server just returns "invalid query" to this - if we try to answer 
-        it then NTws gets a BSOD! (tridge) */
-    case SMB_QUERY_FILE_STREAM_INFO:
-      SIVAL(pdata,0,pos);
-      SIVAL(pdata,4,size);
-      SIVAL(pdata,12,size);
-      len = srvstr_push(outbuf, pdata+24, fname, -1, STR_TERMINATE|STR_CONVERT);
-      SIVAL(pdata,20,len);
-      data_size = 24 + len;
-      break;
+               /* NT4 server just returns "invalid query" to this - if we try to answer 
+                               it then NTws gets a BSOD! (tridge) */
+               case SMB_QUERY_FILE_STREAM_INFO:
+                       SIVAL(pdata,0,pos);
+                       SIVAL(pdata,4,(uint32)size);
+                       SIVAL(pdata,12,(uint32)allocation_size);
+                       len = srvstr_push(outbuf, pdata+24, fname, -1, STR_TERMINATE);
+                       SIVAL(pdata,20,len);
+                       data_size = 24 + len;
+                       break;
 #endif
 
-    default:
-      return(ERROR(ERRDOS,ERRunknownlevel));
-    }
+               default:
+                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       }
 
-  send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, data_size);
+       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, data_size);
 
-  return(-1);
+       return(-1);
 }
 
 /****************************************************************************
-  reply to a TRANS2_SETFILEINFO (set file info by fileid)
+ Deal with the internal needs of setting the delete on close flag. Note that
+ as the tdb locking is recursive, it is safe to call this from within 
+ open_file_shared. JRA.
 ****************************************************************************/
-static int call_trans2setfilepathinfo(connection_struct *conn,
-                                     char *inbuf, char *outbuf, int length, 
-                                     int bufsize, char **pparams, 
-                                     char **ppdata, int total_data)
+
+NTSTATUS set_delete_on_close_internal(files_struct *fsp, BOOL delete_on_close)
 {
-  char *params = *pparams;
-  char *pdata = *ppdata;
-  uint16 tran_call = SVAL(inbuf, smb_setup0);
-  uint16 info_level;
-  int mode=0;
-  SMB_OFF_T size=0;
-  struct utimbuf tvs;
-  SMB_STRUCT_STAT sbuf;
-  pstring fname;
-  int fd = -1;
-  BOOL bad_path = False;
-  files_struct *fsp = NULL;
+       /*
+        * Only allow delete on close for writable shares.
+        */
+
+       if (delete_on_close && !CAN_WRITE(fsp->conn)) {
+               DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but write access denied on share.\n",
+                               fsp->fsp_name ));
+                               return NT_STATUS_ACCESS_DENIED;
+       }
+       /*
+        * Only allow delete on close for files/directories opened with delete intent.
+        */
+
+       if (delete_on_close && !GET_DELETE_ACCESS_REQUESTED(fsp->share_mode)) {
+               DEBUG(10,("set_delete_on_close_internal: file %s delete on close flag set but delete access denied.\n",
+                               fsp->fsp_name ));
+                               return NT_STATUS_ACCESS_DENIED;
+       }
 
-  if (tran_call == TRANSACT2_SETFILEINFO) {
-    fsp = file_fsp(params,0);
-    info_level = SVAL(params,2);    
+       if(fsp->is_directory) {
+               fsp->directory_delete_on_close = delete_on_close;
+               DEBUG(10, ("set_delete_on_close_internal: %s delete on close flag for fnum = %d, directory %s\n",
+                       delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
+       } else if(fsp->stat_open) {
 
-    if(fsp && (fsp->is_directory || fsp->stat_open)) {
-      /*
-       * This is actually a SETFILEINFO on a directory
-       * handle (returned from an NT SMB). NT5.0 seems
-       * to do this call. JRA.
-       */
-      pstrcpy(fname, fsp->fsp_name);
-      unix_convert(fname,conn,0,&bad_path,&sbuf);
-      if (!check_name(fname,conn) || (!VALID_STAT(sbuf))) {
-        DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
-        if((errno == ENOENT) && bad_path)
-        {
-          unix_ERR_class = ERRDOS;
-          unix_ERR_code = ERRbadpath;
-        }
-        return(UNIXERROR(ERRDOS,ERRbadpath));
-      }
-    } else if (fsp->print_file) {
-        /*
-         * Doing a DELETE_ON_CLOSE should cancel a print job.
-         */
-        if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) {
-          fsp->share_mode = FILE_DELETE_ON_CLOSE;
+               DEBUG(10, ("set_delete_on_close_internal: %s delete on close flag for fnum = %d, stat open %s\n",
+                       delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
 
-          DEBUG(3,("call_trans2setfilepathinfo: Cancelling print job (%s)\n",
-               fsp->fsp_name ));
+       } else {
 
-          SSVAL(params,0,0);
-          send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
-          return(-1);
-        }
-    } else {
-      /*
-       * Original code - this is an open file.
-       */
-      CHECK_FSP(fsp,conn);
-      CHECK_ERROR(fsp);
+               files_struct *iterate_fsp;
 
-      pstrcpy(fname, fsp->fsp_name);
-      fd = fsp->fd;
+               /*
+                * Modify the share mode entry for all files open
+                * on this device and inode to tell other smbds we have 
+                * changed the delete on close flag. This will be noticed
+                * in the close code, the last closer will delete the file
+                * if flag is set.
+                */
 
-      if (vfs_fstat(fsp,fd,&sbuf) != 0) {
-        DEBUG(3,("fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
-        return(UNIXERROR(ERRDOS,ERRbadfid));
-      }
-    }
-  } else {
-    /* set path info */
-    info_level = SVAL(params,0);    
-    srvstr_pull(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE);
-    unix_convert(fname,conn,0,&bad_path,&sbuf);
-    if(!check_name(fname, conn))
-    {
-      if((errno == ENOENT) && bad_path)
-      {
-        unix_ERR_class = ERRDOS;
-        unix_ERR_code = ERRbadpath;
-      }
-      return(UNIXERROR(ERRDOS,ERRbadpath));
-    }
-    if(!VALID_STAT(sbuf)) {
-      DEBUG(3,("stat of %s failed (%s)\n", fname, strerror(errno)));
-      if((errno == ENOENT) && bad_path)
-      {
-        unix_ERR_class = ERRDOS;
-        unix_ERR_code = ERRbadpath;
-      }
-      return(UNIXERROR(ERRDOS,ERRbadpath));
-    }    
-  }
+               DEBUG(10,("set_delete_on_close_internal: %s delete on close flag for fnum = %d, file %s\n",
+                                       delete_on_close ? "Adding" : "Removing", fsp->fnum, fsp->fsp_name ));
 
-  if (!CAN_WRITE(conn))
-    return(ERROR(ERRSRV,ERRaccess));
+               if (lock_share_entry_fsp(fsp) == False)
+                               return NT_STATUS_ACCESS_DENIED;
 
-  DEBUG(3,("call_trans2setfilepathinfo(%d) %s info_level=%d totdata=%d\n",
-          tran_call,fname,info_level,total_data));
+               if (!modify_delete_flag(fsp->dev, fsp->inode, delete_on_close)) {
+                       DEBUG(0,("set_delete_on_close_internal: failed to change delete on close flag for file %s\n",
+                                       fsp->fsp_name ));
+                       unlock_share_entry_fsp(fsp);
+                       return NT_STATUS_ACCESS_DENIED;
+               }
 
-  /* Realloc the parameter and data sizes */
-  params = Realloc(*pparams,2);
-  if(params == NULL) {
-    return(ERROR(ERRDOS,ERRnomem));
-  }
-  *pparams     = params;
+               /*
+                * Release the lock.
+                */
 
-  SSVAL(params,0,0);
+               unlock_share_entry_fsp(fsp);
 
-  size = sbuf.st_size;
-  tvs.modtime = sbuf.st_mtime;
-  tvs.actime = sbuf.st_atime;
-  mode = dos_mode(conn,fname,&sbuf);
-
-  if (total_data > 4 && IVAL(pdata,0) == total_data) {
-    /* uggh, EAs for OS2 */
-    DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
-    return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED));
-  }
+               /*
+                * Go through all files we have open on the same device and
+                * inode (hanging off the same hash bucket) and set the DELETE_ON_CLOSE_FLAG.
+                * Other smbd's that have this file open will look in the share_mode on close.
+                * take care of this (rare) case in close_file(). See the comment there.
+                * NB. JRA. We don't really need to do this anymore - all should be taken
+                * care of in the share_mode changes in the tdb.
+                */
 
-  switch (info_level)
-  {
-    case SMB_INFO_STANDARD:
-    case SMB_INFO_QUERY_EA_SIZE:
-    {
-      /* access time */
-      tvs.actime = make_unix_date2(pdata+l1_fdateLastAccess);
+               for(iterate_fsp = file_find_di_first(fsp->dev, fsp->inode);
+                               iterate_fsp; iterate_fsp = file_find_di_next(iterate_fsp))
+                                               fsp->delete_on_close = delete_on_close;
 
-      /* write time */
-      tvs.modtime = make_unix_date2(pdata+l1_fdateLastWrite);
+               /*
+                * Set the delete on close flag in the fsp.
+                */
+               fsp->delete_on_close = delete_on_close;
 
-      mode = SVAL(pdata,l1_attrFile);
-      size = IVAL(pdata,l1_cbFile);
-      break;
-    }
+               DEBUG(10, ("set_delete_on_close_internal: %s delete on close flag for fnum = %d, file %s\n",
+                       delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
 
-    /* XXXX um, i don't think this is right.
-       it's also not in the cifs6.txt spec.
-     */
-    case SMB_INFO_QUERY_EAS_FROM_LIST:
-      tvs.actime = make_unix_date2(pdata+8);
-      tvs.modtime = make_unix_date2(pdata+12);
-      size = IVAL(pdata,16);
-      mode = IVAL(pdata,24);
-      break;
+       }
 
-    /* XXXX nor this.  not in cifs6.txt, either. */
-    case SMB_INFO_QUERY_ALL_EAS:
-      tvs.actime = make_unix_date2(pdata+8);
-      tvs.modtime = make_unix_date2(pdata+12);
-      size = IVAL(pdata,16);
-      mode = IVAL(pdata,24);
-      break;
+       return NT_STATUS_OK;
+}
 
-    case SMB_SET_FILE_BASIC_INFO:
-    {
-      /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
-      time_t write_time;
-      time_t changed_time;
+/****************************************************************************
+ Reply to a TRANS2_SETFILEINFO (set file info by fileid).
+****************************************************************************/
 
-      /* Ignore create time at offset pdata. */
+static int call_trans2setfilepathinfo(connection_struct *conn,
+                                     char *inbuf, char *outbuf, int length, 
+                                     int bufsize, char **pparams, 
+                                     char **ppdata, int total_data)
+{
+       char *params = *pparams;
+       char *pdata = *ppdata;
+       uint16 tran_call = SVAL(inbuf, smb_setup0);
+       uint16 info_level;
+       int mode=0;
+       SMB_OFF_T size=0;
+       struct utimbuf tvs;
+       SMB_STRUCT_STAT sbuf;
+       pstring fname;
+       int fd = -1;
+       BOOL bad_path = False;
+       files_struct *fsp = NULL;
+
+       if (tran_call == TRANSACT2_SETFILEINFO) {
+               fsp = file_fsp(params,0);
+               info_level = SVAL(params,2);    
+
+               if(fsp && (fsp->is_directory || fsp->stat_open)) {
+                       /*
+                        * This is actually a SETFILEINFO on a directory
+                        * handle (returned from an NT SMB). NT5.0 seems
+                        * to do this call. JRA.
+                        */
+                       pstrcpy(fname, fsp->fsp_name);
+                       unix_convert(fname,conn,0,&bad_path,&sbuf);
+                       if (!check_name(fname,conn) || (!VALID_STAT(sbuf))) {
+                               DEBUG(3,("fileinfo of %s failed (%s)\n",fname,strerror(errno)));
+                               if((errno == ENOENT) && bad_path) {
+                                       unix_ERR_class = ERRDOS;
+                                       unix_ERR_code = ERRbadpath;
+                               }
+                               return(UNIXERROR(ERRDOS,ERRbadpath));
+                       }
+               } else if (fsp && fsp->print_file) {
+                       /*
+                        * Doing a DELETE_ON_CLOSE should cancel a print job.
+                        */
+                       if ((info_level == SMB_SET_FILE_DISPOSITION_INFO) && CVAL(pdata,0)) {
+                               fsp->share_mode = FILE_DELETE_ON_CLOSE;
+
+                               DEBUG(3,("call_trans2setfilepathinfo: Cancelling print job (%s)\n", fsp->fsp_name ));
+       
+                               SSVAL(params,0,0);
+                               send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
+                               return(-1);
+                       }
+           } else {
+                       /*
+                        * Original code - this is an open file.
+                        */
+                       CHECK_FSP(fsp,conn);
 
-      /* access time */
-      tvs.actime = interpret_long_date(pdata+8);
+                       pstrcpy(fname, fsp->fsp_name);
+                       fd = fsp->fd;
 
-      write_time = interpret_long_date(pdata+16);
-      changed_time = interpret_long_date(pdata+24);
+                       if (vfs_fstat(fsp,fd,&sbuf) != 0) {
+                               DEBUG(3,("fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
+                               return(UNIXERROR(ERRDOS,ERRbadfid));
+                       }
+               }
+       } else {
+               /* set path info */
+               info_level = SVAL(params,0);    
+               srvstr_pull(inbuf, fname, &params[6], sizeof(fname), -1, STR_TERMINATE);
+               unix_convert(fname,conn,0,&bad_path,&sbuf);
+               if(!check_name(fname, conn)) {
+                       if((errno == ENOENT) && bad_path) {
+                               unix_ERR_class = ERRDOS;
+                               unix_ERR_code = ERRbadpath;
+                       }
+                       return(UNIXERROR(ERRDOS,ERRbadpath));
+               }
+               if(!VALID_STAT(sbuf)) {
+                       DEBUG(3,("stat of %s failed (%s)\n", fname, strerror(errno)));
+                       if((errno == ENOENT) && bad_path) {
+                               unix_ERR_class = ERRDOS;
+                               unix_ERR_code = ERRbadpath;
+                       }
+                       return(UNIXERROR(ERRDOS,ERRbadpath));
+               }    
+       }
 
-      tvs.modtime = MIN(write_time, changed_time);
+       if (!CAN_WRITE(conn))
+               return ERROR_DOS(ERRSRV,ERRaccess);
 
-      /* Prefer a defined time to an undefined one. */
-      if (tvs.modtime == (time_t)0 || tvs.modtime == (time_t)-1)
-       tvs.modtime = (write_time == (time_t)0 || write_time == (time_t)-1
-                      ? changed_time
-                      : write_time);
+       DEBUG(3,("call_trans2setfilepathinfo(%d) %s info_level=%d totdata=%d\n",
+               tran_call,fname,info_level,total_data));
 
-#if 0 /* Needs more testing... */
-      /* Test from Luke to prevent Win95 from
-         setting incorrect values here.
-       */
-      if (tvs.actime < tvs.modtime)
-        return(ERROR(ERRDOS,ERRnoaccess));
-#endif /* Needs more testing... */
+       /* Realloc the parameter and data sizes */
+       params = Realloc(*pparams,2);
+       if(params == NULL)
+               return ERROR_DOS(ERRDOS,ERRnomem);
+       *pparams = params;
 
-      /* attributes */
-      mode = IVAL(pdata,32);
-      break;
-    }
+       SSVAL(params,0,0);
 
-    /*
-     * NT seems to use this call with a size of zero
-     * to mean truncate the file. JRA.
-     */
+       size = sbuf.st_size;
+       tvs.modtime = sbuf.st_mtime;
+       tvs.actime = sbuf.st_atime;
+       mode = dos_mode(conn,fname,&sbuf);
 
-    case SMB_SET_FILE_ALLOCATION_INFO:
-    {
-      SMB_OFF_T newsize = IVAL(pdata,0);
+       if (total_data > 4 && IVAL(pdata,0) == total_data) {
+               /* uggh, EAs for OS2 */
+               DEBUG(4,("Rejecting EA request with total_data=%d\n",total_data));
+               return ERROR_DOS(ERRDOS,ERReasnotsupported);
+       }
+
+       switch (info_level) {
+               case SMB_INFO_STANDARD:
+               case SMB_INFO_QUERY_EA_SIZE:
+               {
+                       /* access time */
+                       tvs.actime = make_unix_date2(pdata+l1_fdateLastAccess);
+
+                       /* write time */
+                       tvs.modtime = make_unix_date2(pdata+l1_fdateLastWrite);
+
+                       mode = SVAL(pdata,l1_attrFile);
+                       size = IVAL(pdata,l1_cbFile);
+                       break;
+               }
+
+               /* XXXX um, i don't think this is right.
+                       it's also not in the cifs6.txt spec.
+               */
+               case SMB_INFO_QUERY_EAS_FROM_LIST:
+                       tvs.actime = make_unix_date2(pdata+8);
+                       tvs.modtime = make_unix_date2(pdata+12);
+                       size = IVAL(pdata,16);
+                       mode = IVAL(pdata,24);
+                       break;
+
+               /* XXXX nor this.  not in cifs6.txt, either. */
+               case SMB_INFO_QUERY_ALL_EAS:
+                       tvs.actime = make_unix_date2(pdata+8);
+                       tvs.modtime = make_unix_date2(pdata+12);
+                       size = IVAL(pdata,16);
+                       mode = IVAL(pdata,24);
+                       break;
+
+               case SMB_SET_FILE_BASIC_INFO:
+               case SMB_FILE_BASIC_INFORMATION:
+               {
+                       /* Patch to do this correctly from Paul Eggert <eggert@twinsun.com>. */
+                       time_t write_time;
+                       time_t changed_time;
+
+                       /* Ignore create time at offset pdata. */
+
+                       /* access time */
+                       tvs.actime = interpret_long_date(pdata+8);
+
+                       write_time = interpret_long_date(pdata+16);
+                       changed_time = interpret_long_date(pdata+24);
+
+                       tvs.modtime = MIN(write_time, changed_time);
+
+                       /* Prefer a defined time to an undefined one. */
+                       if (tvs.modtime == (time_t)0 || tvs.modtime == (time_t)-1)
+                               tvs.modtime = (write_time == (time_t)0 || write_time == (time_t)-1
+                                       ? changed_time : write_time);
+
+                       /* attributes */
+                       mode = IVAL(pdata,32);
+                       break;
+               }
+
+               case  SMB_FILE_ALLOCATION_INFORMATION:
+               case SMB_SET_FILE_ALLOCATION_INFO:
+               {
+                       int ret = -1;
+                       SMB_OFF_T allocation_size = IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-      newsize |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+                       allocation_size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
-      if (IVAL(pdata,4) != 0)  /* more than 32 bits? */
-         return(ERROR(ERRDOS,ERRunknownlevel));
+                       if (IVAL(pdata,4) != 0) /* more than 32 bits? */
+                               return ERROR_DOS(ERRDOS,ERRunknownlevel);
 #endif /* LARGE_SMB_OFF_T */
-      DEBUG(10,("call_trans2setfilepathinfo: Set file allocation info for file %s to %.0f\n", fname, (double)newsize ));
-      if(newsize == 0)
-        size = 0;
-      break;
-    }
+                       DEBUG(10,("call_trans2setfilepathinfo: Set file allocation info for file %s to %.0f\n",
+                                       fname, (double)allocation_size ));
 
-    case SMB_SET_FILE_END_OF_FILE_INFO:
-    {
-      size = IVAL(pdata,0);
+                       if(allocation_size != sbuf.st_size) {
+                               SMB_STRUCT_STAT new_sbuf;
+                               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new allocation size to %.0f\n",
+                                       fname, (double)allocation_size ));
+                               if (fd == -1) {
+                                       files_struct *new_fsp = NULL;
+                                       int access_mode = 0;
+                                       int action = 0;
+                                       if(global_oplock_break) {
+                                               /* Queue this file modify as we are the process of an oplock break.  */
+                                               DEBUG(2,("call_trans2setfilepathinfo: queueing message due to being "));
+                                               DEBUGADD(2,( "in oplock break state.\n"));
+                                               push_oplock_pending_smb_message(inbuf, length);
+                                               return -1;
+                                       }
+                                       new_fsp = open_file_shared(conn, fname, &sbuf,
+                                                                       SET_OPEN_MODE(DOS_OPEN_RDWR),
+                                                                       (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
+                                                                       0, 0, &access_mode, &action);
+                                       if (new_fsp == NULL)
+                                               return(UNIXERROR(ERRDOS,ERRbadpath));
+                                       ret = vfs_allocate_file_space(new_fsp, allocation_size);
+                                       if (vfs_fstat(new_fsp,new_fsp->fd,&new_sbuf) != 0) {
+                                               DEBUG(3,("fstat of fnum %d failed (%s)\n",new_fsp->fnum, strerror(errno)));
+                                               ret = -1;
+                                       }
+                                       close_file(new_fsp,True);
+                               } else {
+                                       ret = vfs_allocate_file_space(fsp, size);
+                                       if (vfs_fstat(fsp,fd,&new_sbuf) != 0) {
+                                               DEBUG(3,("fstat of fnum %d failed (%s)\n",fsp->fnum, strerror(errno)));
+                                               ret = -1;
+                                       }
+                               }
+                               if (ret == -1)
+                                       return ERROR_NT(NT_STATUS_DISK_FULL);
+
+                               /* Allocate can trucate size... */
+                               size = new_sbuf.st_size;
+                       }
+
+                       break;
+               }
+
+       case SMB_FILE_END_OF_FILE_INFORMATION:
+               case SMB_SET_FILE_END_OF_FILE_INFO:
+               {
+                       size = IVAL(pdata,0);
 #ifdef LARGE_SMB_OFF_T
-      size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
+                       size |= (((SMB_OFF_T)IVAL(pdata,4)) << 32);
 #else /* LARGE_SMB_OFF_T */
-      if (IVAL(pdata,4) != 0)  /* more than 32 bits? */
-         return(ERROR(ERRDOS,ERRunknownlevel));
+                       if (IVAL(pdata,4) != 0) /* more than 32 bits? */
+                               return ERROR_DOS(ERRDOS,ERRunknownlevel);
 #endif /* LARGE_SMB_OFF_T */
-      DEBUG(10,("call_trans2setfilepathinfo: Set end of file info for file %s to %.0f\n", fname, (double)size ));
-      break;
-    }
+                       DEBUG(10,("call_trans2setfilepathinfo: Set end of file info for file %s to %.0f\n", fname, (double)size ));
+                       break;
+               }
 
-    case SMB_SET_FILE_DISPOSITION_INFO: /* Set delete on close for open file. */
-    {
-      if ((tran_call == TRANSACT2_SETFILEINFO) && (fsp != NULL))
-      {
-        BOOL delete_on_close = (CVAL(pdata,0) ? True : False);
+               case SMB_FILE_DISPOSITION_INFORMATION:
+               case SMB_SET_FILE_DISPOSITION_INFO: /* Set delete on close for open file. */
+               {
+                       BOOL delete_on_close = (CVAL(pdata,0) ? True : False);
+                       NTSTATUS status;
 
-        if(fsp->is_directory)
-        {
-          fsp->directory_delete_on_close = delete_on_close;
-          DEBUG(10, ("call_trans2setfilepathinfo: %s delete on close flag for fnum = %d, directory %s\n",
-                delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
+                       if (tran_call != TRANSACT2_SETFILEINFO)
+                               return ERROR_DOS(ERRDOS,ERRunknownlevel);
 
-        }
-       else if(fsp->stat_open)
-       {
-          DEBUG(10, ("call_trans2setfilepathinfo: %s delete on close flag for fnum = %d, stat open %s\n",
-                delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
-       }
-        else
-        {
+                       if (fsp == NULL)
+                               return(UNIXERROR(ERRDOS,ERRbadfid));
 
-          /*
-           * We can only set the delete on close flag if
-           * the share mode contained ALLOW_SHARE_DELETE
-           */
-
-          if(!GET_ALLOW_SHARE_DELETE(fsp->share_mode))
-            return(ERROR(ERRDOS,ERRnoaccess));
-
-          /*
-           * If the flag has been set then
-           * modify the share mode entry for all files we have open
-           * on this device and inode to tell other smbds we have 
-           * changed the delete on close flag.
-           */
-
-          if(delete_on_close && !GET_DELETE_ON_CLOSE_FLAG(fsp->share_mode))
-          {
-            int i;
-            files_struct *iterate_fsp;
-            SMB_DEV_T dev = fsp->dev;
-            SMB_INO_T inode = fsp->inode;
-            int num_share_modes;
-            share_mode_entry *current_shares = NULL;
-
-            if (lock_share_entry_fsp(fsp) == False)
-              return(ERROR(ERRDOS,ERRnoaccess));
-
-            /*
-             * Before we allow this we need to ensure that all current opens
-             * on the file have the GET_ALLOW_SHARE_DELETE flag set. If they
-             * do not then we deny this (as we are essentially deleting the
-             * file at this point.
-             */
-
-            num_share_modes = get_share_modes(conn, dev, inode, &current_shares);
-            for(i = 0; i < num_share_modes; i++)
-            {
-              if(!GET_ALLOW_SHARE_DELETE(current_shares[i].share_mode))
-              {
-                DEBUG(5,("call_trans2setfilepathinfo: refusing to set delete on close flag for fnum = %d, \
-file %s as a share exists that was not opened with FILE_DELETE access.\n",
-                      fsp->fnum, fsp->fsp_name ));
-                /*
-                 * Release the lock.
-                 */
-
-                unlock_share_entry_fsp(fsp);
-
-                /*
-                 * current_shares was malloced by get_share_modes - free it here.
-                 */
-
-                free((char *)current_shares);
-
-                /*
-                 * Even though share violation would be more appropriate here,
-                 * return ERRnoaccess as that's what NT does.
-                 */
-
-                return(ERROR(ERRDOS,ERRnoaccess));
-              }
-            }
-
-            /*
-             * current_shares was malloced by get_share_modes - free it here.
-             */
-
-            free((char *)current_shares);
-
-            DEBUG(10,("call_trans2setfilepathinfo: %s delete on close flag for fnum = %d, file %s\n",
-                 delete_on_close ? "Adding" : "Removing", fsp->fnum, fsp->fsp_name ));
-
-            /*
-             * Go through all files we have open on the same device and
-             * inode (hanging off the same hash bucket) and set the DELETE_ON_CLOSE_FLAG.
-             * Other smbd's that have this file open will have to fend for themselves. We
-             * take care of this (rare) case in close_file(). See the comment there.
-             */
-
-            for(iterate_fsp = file_find_di_first(dev, inode); iterate_fsp;
-                                  iterate_fsp = file_find_di_next(iterate_fsp))
-            {
-              int new_share_mode = (delete_on_close ? 
-                                    (iterate_fsp->share_mode | DELETE_ON_CLOSE_FLAG) :
-                                    (iterate_fsp->share_mode & ~DELETE_ON_CLOSE_FLAG) );
-
-              DEBUG(10,("call_trans2setfilepathinfo: Changing share mode for fnum %d, file %s \
-dev = %x, inode = %.0f from %x to %x\n", 
-                    iterate_fsp->fnum, iterate_fsp->fsp_name, (unsigned int)dev, 
-                    (double)inode, iterate_fsp->share_mode, new_share_mode ));
-
-              if(modify_share_mode(iterate_fsp, new_share_mode, iterate_fsp->oplock_type)==False)
-                DEBUG(0,("call_trans2setfilepathinfo: failed to change delete on close for fnum %d, \
-dev = %x, inode = %.0f\n", iterate_fsp->fnum, (unsigned int)dev, (double)inode));
-            }
-
-            /*
-             * Set the delete on close flag in the reference
-             * counted struct. Delete when the last reference
-             * goes away.
-             */
-           fsp->delete_on_close = delete_on_close;
-
-           unlock_share_entry_fsp(fsp);
-
-           DEBUG(10, ("call_trans2setfilepathinfo: %s delete on close flag for fnum = %d, file %s\n",
-                 delete_on_close ? "Added" : "Removed", fsp->fnum, fsp->fsp_name ));
-
-          } /* end if(delete_on_close && !GET_DELETE_ON_CLOSE_FLAG(fsp->share_mode)) */
-        } /* end if is_directory. */
-      } else
-        return(ERROR(ERRDOS,ERRunknownlevel));
-      break;
-    }
+                       status = set_delete_on_close_internal(fsp, delete_on_close);
+                       if (NT_STATUS_V(status) !=  NT_STATUS_V(NT_STATUS_OK))
+                               return ERROR_NT(status);
 
-    default:
-    {
-      return(ERROR(ERRDOS,ERRunknownlevel));
-    }
-  }
+                       break;
+               }
 
-  /* get some defaults (no modifications) if any info is zero or -1. */
-  if (tvs.actime == (time_t)0 || tvs.actime == (time_t)-1)
-    tvs.actime = sbuf.st_atime;
+               default:
+                       return ERROR_DOS(ERRDOS,ERRunknownlevel);
+       }
 
-  if (tvs.modtime == (time_t)0 || tvs.modtime == (time_t)-1)
-    tvs.modtime = sbuf.st_mtime;
+       /* get some defaults (no modifications) if any info is zero or -1. */
+       if (tvs.actime == (time_t)0 || tvs.actime == (time_t)-1)
+               tvs.actime = sbuf.st_atime;
 
-  DEBUG(6,("actime: %s " , ctime(&tvs.actime)));
-  DEBUG(6,("modtime: %s ", ctime(&tvs.modtime)));
-  DEBUG(6,("size: %.0f ", (double)size));
-  DEBUG(6,("mode: %x\n"  , mode));
+       if (tvs.modtime == (time_t)0 || tvs.modtime == (time_t)-1)
+               tvs.modtime = sbuf.st_mtime;
 
-  if(!((info_level == SMB_SET_FILE_END_OF_FILE_INFO) ||
-     (info_level == SMB_SET_FILE_ALLOCATION_INFO))) {
-    /*
-     * Only do this test if we are not explicitly
-     * changing the size of a file.
-     */
-    if (!size)
-      size = sbuf.st_size;
-  }
+       DEBUG(6,("actime: %s " , ctime(&tvs.actime)));
+       DEBUG(6,("modtime: %s ", ctime(&tvs.modtime)));
+       DEBUG(6,("size: %.0f ", (double)size));
+       DEBUG(6,("mode: %x\n"  , mode));
 
-  /* Try and set the times, size and mode of this file -
-     if they are different from the current values
-   */
-  if (sbuf.st_mtime != tvs.modtime || sbuf.st_atime != tvs.actime) {
-    if(fsp != NULL) {
-      /*
-       * This was a setfileinfo on an open file.
-       * NT does this a lot. It's actually pointless
-       * setting the time here, as it will be overwritten
-       * on the next write, so we save the request
-       * away and will set it on file code. JRA.
-       */
+       if(!((info_level == SMB_SET_FILE_END_OF_FILE_INFO) ||
+               (info_level == SMB_SET_FILE_ALLOCATION_INFO) ||
+               (info_level == SMB_FILE_ALLOCATION_INFORMATION) ||
+                       (info_level == SMB_FILE_END_OF_FILE_INFORMATION))) {
 
-       if (tvs.modtime != (time_t)0 && tvs.modtime != (time_t)-1) {
-         DEBUG(10,("call_trans2setfilepathinfo: setting pending modtime to %s\n",
-            ctime(&tvs.modtime) ));
-         fsp->pending_modtime = tvs.modtime;
-       }
+               /*
+                * Only do this test if we are not explicitly
+                * changing the size of a file.
+                */
+               if (!size)
+                       size = sbuf.st_size;
+       }
 
-    } else {
+       /*
+        * Try and set the times, size and mode of this file -
+        * if they are different from the current values
+        */
+       if (sbuf.st_mtime != tvs.modtime || sbuf.st_atime != tvs.actime) {
+               if(fsp != NULL) {
+                       /*
+                        * This was a setfileinfo on an open file.
+                        * NT does this a lot. It's actually pointless
+                        * setting the time here, as it will be overwritten
+                        * on the next write, so we save the request
+                        * away and will set it on file code. JRA.
+                        */
+
+                       if (tvs.modtime != (time_t)0 && tvs.modtime != (time_t)-1) {
+                               DEBUG(10,("call_trans2setfilepathinfo: setting pending modtime to %s\n", ctime(&tvs.modtime) ));
+                               fsp->pending_modtime = tvs.modtime;
+                       }
 
-      DEBUG(10,("call_trans2setfilepathinfo: setting utimes to modified values.\n"));
+               } else {
 
-      if(file_utime(conn, fname, &tvs)!=0)
-        return(UNIXERROR(ERRDOS,ERRnoaccess));
-    }
-  }
+                       DEBUG(10,("call_trans2setfilepathinfo: setting utimes to modified values.\n"));
 
-  /* check the mode isn't different, before changing it */
-  if ((mode != 0) && (mode != dos_mode(conn, fname, &sbuf))) {
+                       if(file_utime(conn, fname, &tvs)!=0)
+                               return(UNIXERROR(ERRDOS,ERRnoaccess));
+               }
+       }
 
-    DEBUG(10,("call_trans2setfilepathinfo: file %s : setting dos mode %x\n",
-          fname, mode ));
+       /* check the mode isn't different, before changing it */
+       if ((mode != 0) && (mode != dos_mode(conn, fname, &sbuf))) {
 
-    if(file_chmod(conn, fname, mode, NULL)) {
-      DEBUG(2,("chmod of %s failed (%s)\n", fname, strerror(errno)));
-      return(UNIXERROR(ERRDOS,ERRnoaccess));
-    }
-  }
+               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting dos mode %x\n", fname, mode ));
+
+               if(file_chmod(conn, fname, mode, NULL)) {
+                       DEBUG(2,("chmod of %s failed (%s)\n", fname, strerror(errno)));
+                       return(UNIXERROR(ERRDOS,ERRnoaccess));
+               }
+       }
 
-  if(size != sbuf.st_size) {
+       if(size != sbuf.st_size) {
 
-    DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
-          fname, (double)size ));
+               DEBUG(10,("call_trans2setfilepathinfo: file %s : setting new size to %.0f\n",
+                       fname, (double)size ));
 
-    if (fd == -1) {
-      files_struct *new_fsp = NULL;
-      int access_mode = 0;
-      int action = 0;
+               if (fd == -1) {
+                       files_struct *new_fsp = NULL;
+                       int access_mode = 0;
+                       int action = 0;
 
-      if(global_oplock_break) {
-        /* Queue this file modify as we are the process of an oplock break.  */
+                       if(global_oplock_break) {
+                               /* Queue this file modify as we are the process of an oplock break.  */
 
-        DEBUG(2,("call_trans2setfilepathinfo: queueing message due to being "));
-        DEBUGADD(2,( "in oplock break state.\n"));
+                               DEBUG(2,("call_trans2setfilepathinfo: queueing message due to being "));
+                               DEBUGADD(2,( "in oplock break state.\n"));
 
-        push_oplock_pending_smb_message(inbuf, length);
-        return -1;
-      }
+                               push_oplock_pending_smb_message(inbuf, length);
+                               return -1;
+                       }
 
-      new_fsp = open_file_shared(conn, fname, &sbuf,
-                           SET_OPEN_MODE(DOS_OPEN_RDWR),
-                           (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
-                           0, 0, &access_mode, &action);
+                       new_fsp = open_file_shared(conn, fname, &sbuf,
+                                               SET_OPEN_MODE(DOS_OPEN_RDWR),
+                                               (FILE_FAIL_IF_NOT_EXIST|FILE_EXISTS_OPEN),
+                                               0, 0, &access_mode, &action);
        
-      if (new_fsp == NULL)
-        return(UNIXERROR(ERRDOS,ERRbadpath));
-      vfs_set_filelen(new_fsp, size);
-      close_file(new_fsp,True);
-    } else {
-        vfs_set_filelen(fsp, size);
-    }
-  }
+                       if (new_fsp == NULL)
+                               return(UNIXERROR(ERRDOS,ERRbadpath));
+                       vfs_set_filelen(new_fsp, size);
+                       close_file(new_fsp,True);
+               } else {
+                       vfs_set_filelen(fsp, size);
+               }
+       }
 
-  SSVAL(params,0,0);
+       SSVAL(params,0,0);
 
-  send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
+       send_trans2_replies(outbuf, bufsize, params, 2, *ppdata, 0);
   
-  return(-1);
+       return(-1);
 }
 
 /****************************************************************************
 reply to a TRANS2_MKDIR (make directory with extended attributes).
Reply to a TRANS2_MKDIR (make directory with extended attributes).
 ****************************************************************************/
+
 static int call_trans2mkdir(connection_struct *conn,
                            char *inbuf, char *outbuf, int length, int bufsize,
                            char **pparams, char **ppdata)
@@ -2057,7 +2333,7 @@ static int call_trans2mkdir(connection_struct *conn,
   BOOL bad_path = False;
 
   if (!CAN_WRITE(conn))
-    return(ERROR(ERRSRV,ERRaccess));
+    return ERROR_DOS(ERRSRV,ERRaccess);
 
   srvstr_pull(inbuf, directory, &params[4], sizeof(directory), -1, STR_TERMINATE);
 
@@ -2081,7 +2357,7 @@ static int call_trans2mkdir(connection_struct *conn,
   /* Realloc the parameter and data sizes */
   params = Realloc(*pparams,2);
   if(params == NULL) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *pparams     = params;
 
@@ -2093,9 +2369,10 @@ static int call_trans2mkdir(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a TRANS2_FINDNOTIFYFIRST (start monitoring a directory for changes)
 We don't actually do this - we just send a null response.
+ Reply to a TRANS2_FINDNOTIFYFIRST (start monitoring a directory for changes).
+ We don't actually do this - we just send a null response.
 ****************************************************************************/
+
 static int call_trans2findnotifyfirst(connection_struct *conn,
                                      char *inbuf, char *outbuf, 
                                      int length, int bufsize,
@@ -2113,13 +2390,13 @@ static int call_trans2findnotifyfirst(connection_struct *conn,
     case 2:
       break;
     default:
-      return(ERROR(ERRDOS,ERRunknownlevel));
+      return ERROR_DOS(ERRDOS,ERRunknownlevel);
     }
 
   /* Realloc the parameter and data sizes */
   params = Realloc(*pparams,6);
   if(params == NULL) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *pparams     = params;
 
@@ -2138,9 +2415,10 @@ static int call_trans2findnotifyfirst(connection_struct *conn,
 }
 
 /****************************************************************************
 reply to a TRANS2_FINDNOTIFYNEXT (continue monitoring a directory for 
 changes). Currently this does nothing.
Reply to a TRANS2_FINDNOTIFYNEXT (continue monitoring a directory for 
+ changes). Currently this does nothing.
 ****************************************************************************/
+
 static int call_trans2findnotifynext(connection_struct *conn,
                                     char *inbuf, char *outbuf, 
                                     int length, int bufsize,
@@ -2153,7 +2431,7 @@ static int call_trans2findnotifynext(connection_struct *conn,
   /* Realloc the parameter and data sizes */
   params = Realloc(*pparams,4);
   if(params == NULL) {
-    return(ERROR(ERRDOS,ERRnomem));
+    return ERROR_DOS(ERRDOS,ERRnomem);
   }
   *pparams     = params;
 
@@ -2166,8 +2444,9 @@ static int call_trans2findnotifynext(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a TRANS2_GET_DFS_REFERRAL - Shirish Kalele <kalele@veritas.com>
+ Reply to a TRANS2_GET_DFS_REFERRAL - Shirish Kalele <kalele@veritas.com>.
 ****************************************************************************/
+
 static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf,
                                     char* outbuf, int length, int bufsize,
                                     char** pparams, char** ppdata)
@@ -2181,12 +2460,12 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf,
   DEBUG(10,("call_trans2getdfsreferral\n"));
 
   if(!lp_host_msdfs())
-    return(ERROR(ERRDOS,ERRbadfunc));
+    return ERROR_DOS(ERRDOS,ERRbadfunc);
 
-  srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE|STR_CONVERT);
+  srvstr_pull(inbuf, pathname, &params[2], sizeof(pathname), -1, STR_TERMINATE);
 
   if((reply_size = setup_dfs_referral(pathname,max_referral_level,ppdata)) < 0)
-    return(ERROR(ERRDOS,ERRbadfile));
+    return ERROR_DOS(ERRDOS,ERRbadfile);
     
   SSVAL(outbuf,smb_flg2,SVAL(outbuf,smb_flg2) | FLAGS2_DFS_PATHNAMES);
   send_trans2_replies(outbuf,bufsize,0,0,*ppdata,reply_size);
@@ -2198,7 +2477,7 @@ static int call_trans2getdfsreferral(connection_struct *conn, char* inbuf,
 #define LMFUNC_GETJOBID 0x60
 
 /****************************************************************************
 reply to a TRANS2_IOCTL - used for OS/2 printing.
Reply to a TRANS2_IOCTL - used for OS/2 printing.
 ****************************************************************************/
 
 static int call_trans2ioctl(connection_struct *conn, char* inbuf,
@@ -2212,7 +2491,7 @@ static int call_trans2ioctl(connection_struct *conn, char* inbuf,
       (SVAL(inbuf,(smb_setup+6)) == LMFUNC_GETJOBID)) {
     pdata = Realloc(*ppdata, 32);
     if(pdata == NULL) {
-      return(ERROR(ERRDOS,ERRnomem));
+      return ERROR_DOS(ERRDOS,ERRnomem);
     }
     *ppdata = pdata;
 
@@ -2220,19 +2499,20 @@ static int call_trans2ioctl(connection_struct *conn, char* inbuf,
           CAN ACCEPT THIS IN UNICODE. JRA. */
 
     SSVAL(pdata,0,fsp->print_jobid);                     /* Job number */
-       srvstr_push( outbuf, pdata + 2, global_myname, 15, STR_CONVERT|STR_ASCII|STR_TERMINATE); /* Our NetBIOS name */
-    srvstr_push( outbuf, pdata+18, lp_servicename(SNUM(conn)), 13, STR_CONVERT|STR_ASCII|STR_TERMINATE); /* Service name */
+       srvstr_push( outbuf, pdata + 2, global_myname, 15, STR_ASCII|STR_TERMINATE); /* Our NetBIOS name */
+    srvstr_push( outbuf, pdata+18, lp_servicename(SNUM(conn)), 13, STR_ASCII|STR_TERMINATE); /* Service name */
     send_trans2_replies(outbuf,bufsize,*pparams,0,*ppdata,32);
     return(-1);
   } else {
     DEBUG(2,("Unknown TRANS2_IOCTL\n"));
-    return(ERROR(ERRSRV,ERRerror));
+    return ERROR_DOS(ERRSRV,ERRerror);
   }
 }
 
 /****************************************************************************
-  reply to a SMBfindclose (stop trans2 directory search)
+ Reply to a SMBfindclose (stop trans2 directory search).
 ****************************************************************************/
+
 int reply_findclose(connection_struct *conn,
                    char *inbuf,char *outbuf,int length,int bufsize)
 {
@@ -2253,8 +2533,9 @@ int reply_findclose(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a SMBfindnclose (stop FINDNOTIFYFIRST directory search)
+ Reply to a SMBfindnclose (stop FINDNOTIFYFIRST directory search).
 ****************************************************************************/
+
 int reply_findnclose(connection_struct *conn, 
                     char *inbuf,char *outbuf,int length,int bufsize)
 {
@@ -2278,10 +2559,10 @@ int reply_findnclose(connection_struct *conn,
        return(outsize);
 }
 
-
 /****************************************************************************
 reply to a SMBtranss2 - just ignore it!
Reply to a SMBtranss2 - just ignore it!
 ****************************************************************************/
+
 int reply_transs2(connection_struct *conn,
                  char *inbuf,char *outbuf,int length,int bufsize)
 {
@@ -2292,8 +2573,9 @@ int reply_transs2(connection_struct *conn,
 }
 
 /****************************************************************************
-  reply to a SMBtrans2
+ Reply to a SMBtrans2.
 ****************************************************************************/
+
 int reply_trans2(connection_struct *conn,
                 char *inbuf,char *outbuf,int length,int bufsize)
 {
@@ -2329,7 +2611,7 @@ int reply_trans2(connection_struct *conn,
        if (IS_IPC(conn) && (tran_call != TRANSACT2_OPEN)
             && (tran_call != TRANSACT2_GET_DFS_REFERRAL)) {
                END_PROFILE(SMBtrans2);
-               return(ERROR(ERRSRV,ERRaccess));
+               return ERROR_DOS(ERRSRV,ERRaccess);
        }
 
        outsize = set_message(outbuf,0,0,True);
@@ -2353,7 +2635,7 @@ int reply_trans2(connection_struct *conn,
                        DEBUG(2,("Invalid smb_sucnt in trans2 call(%d)\n",suwcnt));
                        DEBUG(2,("Transaction is %d\n",tran_call));
                        END_PROFILE(SMBtrans2);
-                       return(ERROR(ERRSRV,ERRerror));
+                       return ERROR_DOS(ERRSRV,ERRerror);
                }
        }
     
@@ -2365,12 +2647,10 @@ int reply_trans2(connection_struct *conn,
   
        if ((total_params && !params)  || (total_data && !data)) {
                DEBUG(2,("Out of memory in reply_trans2\n"));
-               if(params)
-                 free(params);
-               if(data)
-                 free(data); 
+               SAFE_FREE(params);
+               SAFE_FREE(data); 
                END_PROFILE(SMBtrans2);
-               return(ERROR(ERRDOS,ERRnomem));
+               return ERROR_DOS(ERRDOS,ERRnomem);
        }
 
        /* Copy the param and data bytes sent with this request into
@@ -2390,7 +2670,8 @@ int reply_trans2(connection_struct *conn,
                /* We need to send an interim response then receive the rest
                   of the parameter/data bytes */
                outsize = set_message(outbuf,0,0,True);
-               send_smb(smbd_server_fd(),outbuf);
+               if (!send_smb(smbd_server_fd(),outbuf))
+                       exit_server("reply_trans2: send_smb failed.");
 
                while (num_data_sofar < total_data || 
                       num_params_sofar < total_params) {
@@ -2406,12 +2687,10 @@ int reply_trans2(connection_struct *conn,
                                else
                                        DEBUG(0,("reply_trans2: %s in getting secondary trans2 response.\n",
                                                 (smb_read_error == READ_ERROR) ? "error" : "timeout" ));
-                               if(params)
-                                       free(params);
-                               if(data)
-                                       free(data);
+                               SAFE_FREE(params);
+                               SAFE_FREE(data);
                                END_PROFILE(SMBtrans2);
-                               return(ERROR(ERRSRV,ERRerror));
+                               return ERROR_DOS(ERRSRV,ERRerror);
                        }
       
                        /* Revise total_params and total_data in case
@@ -2530,12 +2809,10 @@ int reply_trans2(connection_struct *conn,
        default:
                /* Error in request */
                DEBUG(2,("Unknown request %d in trans2 call\n", tran_call));
-               if(params)
-                       free(params);
-               if(data)
-                       free(data);
+               SAFE_FREE(params);
+               SAFE_FREE(data);
                END_PROFILE(SMBtrans2);
-               return (ERROR(ERRSRV,ERRerror));
+               return ERROR_DOS(ERRSRV,ERRerror);
        }
        
        /* As we do not know how many data packets will need to be
@@ -2545,10 +2822,8 @@ int reply_trans2(connection_struct *conn,
           an error packet. 
        */
        
-       if(params)
-               free(params);
-       if(data)
-               free(data);
+       SAFE_FREE(params);
+       SAFE_FREE(data);
        END_PROFILE(SMBtrans2);
        return outsize; /* If a correct response was needed the
                           call_trans2xxx calls have already sent