Changeset 98813 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 2, 2023 12:20:41 PM (21 months ago)

Author:

vboxsync

Message:

Guest Control: Removed the ACL data portion from the HGCM callback messages (as ACLs are not implemented yet). bugref:9783

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp (modified) (7 diffs)
• VBoxService/VBoxServiceControlSession.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestCtrl.cpp

@@ -2281 +2281 @@
  * @param   pszGroups           Associated user groups as a string.
  *                              Multiple groups are delimited by "\r\n", whereas the first group always is the primary group.
- * @param   pvACL               ACL block to send.
- * @param   cbACL               Size (in bytes) of ACL block to send.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlDirCbReadEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLDIRENTRYEX pEntry, uint32_t cbSize,
-                                           char *pszUser, char *pszGroups, void *pvACL, size_t cbACL)
+                                           char *pszUser, char *pszGroups)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
     AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
     AssertPtrReturn(pszGroups, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvACL, VERR_INVALID_POINTER);
-    AssertReturn(cbACL, VERR_INVALID_PARAMETER);
 
     HGCMReplyDirNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 4);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_DIR_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 3);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_DIR_NOTIFYTYPE_READ);
@@ -2302 +2298 @@
     VbglHGCMParmPtrSetString(&Msg.u.read.user,    pszUser);
     VbglHGCMParmPtrSetString(&Msg.u.read.groups,  pszGroups);
-    VbglHGCMParmPtrSet      (&Msg.u.read.acl,     pvACL, (uint32_t)cbACL);
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyDirNotify, u.read));
@@ -2322 +2317 @@
 {
     char szIgnored[1] = { 0 };
-    return VbglR3GuestCtrlDirCbReadEx(pCtx, uRc, pEntry, cbSize, szIgnored /* pszUser */, szIgnored /* pszGroups */,
-                                      szIgnored /* pvACL */, sizeof(szIgnored) /* cbACL */);
+    return VbglR3GuestCtrlDirCbReadEx(pCtx, uRc, pEntry, cbSize, szIgnored /* pszUser */, szIgnored /* pszGroups */);
 }
 
@@ -2605 +2599 @@
  * @param   pszGroups           Associated user groups as a string.
  *                              Multiple groups are delimited by "\r\n", whereas the first group always is the primary group.
- * @param   pvACL               ACL block to send.
- * @param   cbACL               Size (in bytes) of ACL block to send.
  */
 VBGLR3DECL(int) VbglR3GuestCtrlFsCbQueryInfoEx(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, PGSTCTLFSOBJINFO pFsObjInfo,
-                                               char *pszUser, char *pszGroups, void *pvACL, uint32_t cbACL)
+                                               char *pszUser, char *pszGroups)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
@@ -2615 +2607 @@
     AssertPtrReturn(pszUser, VERR_INVALID_POINTER);
     AssertPtrReturn(pszGroups, VERR_INVALID_POINTER);
-    AssertPtrReturn(pvACL, VERR_INVALID_POINTER);
-    AssertReturn(cbACL, VERR_INVALID_PARAMETER);
 
     HGCMReplyFsNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, 7);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 3);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_QUERY_INFO);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
+
     VbglHGCMParmPtrSet      (&Msg.u.queryinfo.obj_info, pFsObjInfo, sizeof(GSTCTLFSOBJINFO));
     VbglHGCMParmPtrSetString(&Msg.u.queryinfo.user,   pszUser);
     VbglHGCMParmPtrSetString(&Msg.u.queryinfo.groups, pszGroups);
-    VbglHGCMParmPtrSet      (&Msg.u.queryinfo.acl,    pvACL, cbACL);
 
     return VbglR3HGCMCall(&Msg.reply_hdr.hdr, RT_UOFFSET_AFTER(HGCMReplyFsNotify, u.queryinfo));
@@ -2643 +2633 @@
 {
     char szIgnored[1];
-    return VbglR3GuestCtrlFsCbQueryInfoEx(pCtx, uRc, pFsObjInfo, szIgnored /* pszUser */, szIgnored /* pszGroups */,
-                                          szIgnored /* pvACL */, sizeof(szIgnored) /* cbACL */);
+    return VbglR3GuestCtrlFsCbQueryInfoEx(pCtx, uRc, pFsObjInfo, szIgnored /* pszUser */, szIgnored /* pszGroups */);
 }
 
@@ -2663 +2652 @@
 
     HGCMReplyFsNotify Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.reply_hdr.hdr, pCtx->uClientID, GUEST_MSG_FS_NOTIFY, GSTCTL_HGCM_REPLY_HDR_PARMS + 1);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.context, pCtx->uContextID);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.type, GUEST_FS_NOTIFYTYPE_CREATE_TEMP);
     VbglHGCMParmUInt32Set(&Msg.reply_hdr.rc, uRc);
+
     VbglHGCMParmPtrSetString(&Msg.u.createtemp.path, pszPath);
 

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -1185 +1185 @@
                          pszGroup ? pszGroup : "", DirEntryEx.Info.Attr.u.UnixGroup.gid);
 
-            char szIgnored[] = "???"; /** @todo Implement ACL support. */
+            char szIgnored[] = "???";
             int rc2 = VbglR3GuestCtrlDirCbReadEx(pHostCtx, rc,
                                                  &DirEntryEx, (uint32_t)(sizeof(GSTCTLDIRENTRYEX) + cbDirEntry),
-                                                 pszUser ? pszUser : szIgnored, pszGroup ? pszGroup : szIgnored,
-                                                 szIgnored /* pvACL */, sizeof(szIgnored) /* cbACL */);
+                                                 pszUser ? pszUser : szIgnored, pszGroup ? pszGroup : szIgnored);
             RTStrFree(pszUser);
             RTStrFree(pszGroup);
@@ -1870 +1869 @@
         AssertStmt(pszGroup != NULL, rc = VERR_NO_MEMORY);
 
-        char  szNotImplemented[] = "<not-implemented>"; /** @todo Implement ACL support. */
-        int rc2 = VbglR3GuestCtrlFsCbQueryInfoEx(pHostCtx, rc, pObjInfo, pszUser, pszGroup,
-                                                 szNotImplemented, sizeof(szNotImplemented));
+        int rc2 = VbglR3GuestCtrlFsCbQueryInfoEx(pHostCtx, rc, pObjInfo, pszUser, pszGroup);
         RTStrFree(pszUser);
         RTStrFree(pszGroup);