Changeset 732 for branches/samba-3.5.x/source3/smbd/open.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/smbd/open.c (modified) (4 diffs)

branches/samba-3.5.x/source3/smbd/open.c

@@ -661 +661 @@
 }
 
-/*******************************************************************
- Return True if the filename is one of the special executable types.
-********************************************************************/
-
-bool is_executable(const char *fname)
-{
-        if ((fname = strrchr_m(fname,'.'))) {
-                if (strequal(fname,".com") ||
-                    strequal(fname,".dll") ||
-                    strequal(fname,".exe") ||
-                    strequal(fname,".sym")) {
-                        return True;
-                }
-        }
-        return False;
-}
-
 /****************************************************************************
  Check if we can open a file with a share mode.
@@ -1221 +1204 @@
         return dup_file_fsp(req, fsp, access_mask, share_access,
                             create_options, fsp_to_dup_into);
-}
-
-/****************************************************************************
- Open a file with a share mode - old openX method - map into NTCreate.
-****************************************************************************/
-
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
-                                 int deny_mode, int open_func,
-                                 uint32 *paccess_mask,
-                                 uint32 *pshare_mode,
-                                 uint32 *pcreate_disposition,
-                                 uint32 *pcreate_options)
-{
-        uint32 access_mask;
-        uint32 share_mode;
-        uint32 create_disposition;
-        uint32 create_options = FILE_NON_DIRECTORY_FILE;
-
-        DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
-                  "open_func = 0x%x\n",
-                  smb_fname_str_dbg(smb_fname), (unsigned int)deny_mode,
-                  (unsigned int)open_func ));
-
-        /* Create the NT compatible access_mask. */
-        switch (GET_OPENX_MODE(deny_mode)) {
-                case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */
-                case DOS_OPEN_RDONLY:
-                        access_mask = FILE_GENERIC_READ;
-                        break;
-                case DOS_OPEN_WRONLY:
-                        access_mask = FILE_GENERIC_WRITE;
-                        break;
-                case DOS_OPEN_RDWR:
-                case DOS_OPEN_FCB:
-                        access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
-                        break;
-                default:
-                        DEBUG(10,("map_open_params_to_ntcreate: bad open mode = 0x%x\n",
-                                  (unsigned int)GET_OPENX_MODE(deny_mode)));
-                        return False;
-        }
-
-        /* Create the NT compatible create_disposition. */
-        switch (open_func) {
-                case OPENX_FILE_EXISTS_FAIL|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_CREATE;
-                        break;
-
-                case OPENX_FILE_EXISTS_OPEN:
-                        create_disposition = FILE_OPEN;
-                        break;
-
-                case OPENX_FILE_EXISTS_OPEN|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_OPEN_IF;
-                        break;
-       
-                case OPENX_FILE_EXISTS_TRUNCATE:
-                        create_disposition = FILE_OVERWRITE;
-                        break;
-
-                case OPENX_FILE_EXISTS_TRUNCATE|OPENX_FILE_CREATE_IF_NOT_EXIST:
-                        create_disposition = FILE_OVERWRITE_IF;
-                        break;
-
-                default:
-                        /* From samba4 - to be confirmed. */
-                        if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_EXEC) {
-                                create_disposition = FILE_CREATE;
-                                break;
-                        }
-                        DEBUG(10,("map_open_params_to_ntcreate: bad "
-                                  "open_func 0x%x\n", (unsigned int)open_func));
-                        return False;
-        }
- 
-        /* Create the NT compatible share modes. */
-        switch (GET_DENY_MODE(deny_mode)) {
-                case DENY_ALL:
-                        share_mode = FILE_SHARE_NONE;
-                        break;
-
-                case DENY_WRITE:
-                        share_mode = FILE_SHARE_READ;
-                        break;
-
-                case DENY_READ:
-                        share_mode = FILE_SHARE_WRITE;
-                        break;
-
-                case DENY_NONE:
-                        share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-                        break;
-
-                case DENY_DOS:
-                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
-                        if (is_executable(smb_fname->base_name)) {
-                                share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-                        } else {
-                                if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
-                                        share_mode = FILE_SHARE_READ;
-                                } else {
-                                        share_mode = FILE_SHARE_NONE;
-                                }
-                        }
-                        break;
-
-                case DENY_FCB:
-                        create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
-                        share_mode = FILE_SHARE_NONE;
-                        break;
-
-                default:
-                        DEBUG(10,("map_open_params_to_ntcreate: bad deny_mode 0x%x\n",
-                                (unsigned int)GET_DENY_MODE(deny_mode) ));
-                        return False;
-        }
-
-        DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
-                  "share_mode = 0x%x, create_disposition = 0x%x, "
-                  "create_options = 0x%x\n",
-                  smb_fname_str_dbg(smb_fname),
-                  (unsigned int)access_mask,
-                  (unsigned int)share_mode,
-                  (unsigned int)create_disposition,
-                  (unsigned int)create_options ));
-
-        if (paccess_mask) {
-                *paccess_mask = access_mask;
-        }
-        if (pshare_mode) {
-                *pshare_mode = share_mode;
-        }
-        if (pcreate_disposition) {
-                *pcreate_disposition = create_disposition;
-        }
-        if (pcreate_options) {
-                *pcreate_options = create_options;
-        }
-
-        return True;
-
 }
 
@@ -1503 +1345 @@
         ZERO_STRUCT(id);
 
-        /* Windows allows a new file to be created and
-           silently removes a FILE_ATTRIBUTE_DIRECTORY
-           sent by the client. Do the same. */
-
-        new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
-
         if (conn->printer) {
                 /*
@@ -1542 +1378 @@
                 new_dos_attributes = 0;
         } else {
+                /* Windows allows a new file to be created and
+                   silently removes a FILE_ATTRIBUTE_DIRECTORY
+                   sent by the client. Do the same. */
+
+                new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
+
                 /* We add aARCH to this as this mode is only used if the file is
                  * created new. */