Changeset 27729 in vbox for trunk/src/VBox/Additions

Timestamp:

Mar 26, 2010 11:06:22 AM (15 years ago)

Author:

vboxsync

Message:

Additions/Solaris: SharedFolders, fix permissions for opening readonly files (public #6320)

File:

• trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c (modified) (2 diffs)

trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c

@@ -288 +288 @@
          * try read only.
          */
+        bzero(&parms, sizeof(parms));
         str = sfprov_string(path, &size);
-        parms.Handle = 0;
+        parms.Handle = SHFL_HANDLE_NIL;
         parms.Info.cbObject = 0;
         parms.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READWRITE;
         rc = vboxCallCreate(&vbox_client, &mnt->map, str, &parms);
-
-        if (RT_FAILURE(rc)) {
+        if (RT_FAILURE(rc) && rc != VERR_ACCESS_DENIED) {
                 kmem_free(str, size);
-                return (EINVAL);
+                return RTErrConvertToErrno(rc);
         }
         if (parms.Handle == SHFL_HANDLE_NIL) {
-                if (parms.Result == SHFL_NO_RESULT ||
-                    parms.Result == SHFL_PATH_NOT_FOUND ||
+                if (parms.Result == SHFL_PATH_NOT_FOUND ||
                     parms.Result == SHFL_FILE_NOT_FOUND) {
                         kmem_free(str, size);
-                        return (ENOENT);
+                        return ENOENT;
                 }
                 parms.CreateFlags =
@@ -310 +309 @@
                 if (RT_FAILURE(rc)) {
                         kmem_free(str, size);
-                        return (EINVAL);
+                        return RTErrConvertToErrno(rc);
                 }
                 if (parms.Handle == SHFL_HANDLE_NIL) {
                         kmem_free(str, size);
-                        return (ENOENT);
+                        return RTErrConvertToErrno(rc);
                 }
         }