2 files changed, 4 insertions, 49 deletions
diff --git a/src/ext/Util/ca/scasmb.h b/src/ext/Util/ca/scasmb.h
index f2a4b53c..7169cf2b 100644
--- a/src/ext/Util/ca/scasmb.h
+++ b/src/ext/Util/ca/scasmb.h
@@ -23,14 +23,11 @@ struct SCA_SMB  // hungarian ss
        WCHAR wzDirectory[MAX_PATH + 1];
        int nUserPermissionCount;
-        int nPermissions;
        SCA_SMB_EX_USER_PERMS* pExUserPerms;
        INSTALLSTATE isInstalled, isAction;
        BOOL fUseIntegratedAuth;
-        BOOL fLegacyUserProvided;
-        struct SCA_USER scau;
        struct SCA_SMB* pssNext;
 };
diff --git a/src/ext/Util/ca/scasmbsched.cpp b/src/ext/Util/ca/scasmbsched.cpp
index 53e8400d..fefd4781 100644
--- a/src/ext/Util/ca/scasmbsched.cpp
+++ b/src/ext/Util/ca/scasmbsched.cpp
@@ -92,17 +92,14 @@ void ScaExUserPermsSmbFreeList(SCA_SMB_EX_USER_PERMS* pExUserPermsList)
 }
 // sql query constants
-LPCWSTR vcsSmbQuery = L"SELECT `FileShare`, `ShareName`, `Description`, `Directory_`, "
+LPCWSTR vcsSmbQuery = L"SELECT `FileShare`, `ShareName`, `Component_`, `Description`, `Directory_` FROM `Wix4FileShare`";
-    L"`Component_`, `User_`, `Permissions` FROM `Wix4FileShare`";
 enum eSmbQuery {
    ssqFileShare = 1,
    ssqShareName,
+    ssqComponent,
    ssqDescription,
    ssqDirectory,
-    ssqComponent,
-    ssqUser,
-    ssqPermissions
    };
@@ -173,31 +170,11 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList)
        hr = ::StringCchCopyW(pss->wzDescription, countof(pss->wzDescription), pwzData);
        ExitOnFailure(hr, "Failed to copy description string to smb object");
-        // get user info from the user table
-        hr = WcaGetRecordFormattedString(hRec, ssqUser, &pwzData);
-        ExitOnFailure(hr, "Failed to get Wix4User record for Wix4FileShare: '%ls'", pss->wzShareName);
        // get component install state
        er = ::MsiGetComponentStateW(WcaGetInstallHandle(), pss->wzComponent, &pss->isInstalled, &pss->isAction);
        hr = HRESULT_FROM_WIN32(er);
        ExitOnFailure(hr, "Failed to get Component state for Wix4FileShare");
-        // if a user was specified
-        if (*pwzData)
-        {
-            pss->fUseIntegratedAuth = FALSE;
-            pss->fLegacyUserProvided = TRUE;
-            hr = ScaGetUser(pwzData, &pss->scau);
-            ExitOnFailure(hr, "Failed to get user information for fileshare: '%ls'", pss->wzShareName);
-        }
-        else
-        {
-            pss->fLegacyUserProvided = FALSE;
-            // TODO: figure out whether this is useful still
-            //pss->fUseIntegratedAuth = TRUE;
-            // integrated authorization doesn't have a User record
-        }
        // get the share's directory
        hr = WcaGetRecordString(hRec, ssqDirectory, &pwzData);
        ExitOnFailure(hr, "Failed to get directory for Wix4FileShare: '%ls'", pss->wzShareName);
@@ -235,9 +212,6 @@ HRESULT ScaSmbRead(SCA_SMB** ppssList)
        hr = ::StringCchCopyW(pss->wzDirectory, countof(pss->wzDirectory), wzPath);
        ExitOnFailure(hr, "Failed to copy directory string to smb object");
-        hr = WcaGetRecordInteger(hRec, ssqPermissions, &pss->nPermissions);
-        ExitOnFailure(hr, "Failed to get Wix4FileShare.Permissions");
        // Check to see if additional user & permissions are specified for this share
        if (bUserPermissionsTableExists)
        {
@@ -378,24 +352,8 @@ HRESULT SchedCreateSmb(SCA_SMB* pss)
    hr = WcaWriteStringToCaData(pss->fUseIntegratedAuth ? L"1" : L"0", &pwzCustomActionData);
    ExitOnFailure(hr, "Failed to add server name to CustomActionData");
-    if (pss->fLegacyUserProvided)
+    hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount, &pwzCustomActionData);
-    {
+    ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData");
-        hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount + 1, &pwzCustomActionData);
-        ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData");
-        hr = UserBuildDomainUserName(wzDomainUser, countof(wzDomainUser), pss->scau.wzName, pss->scau.wzDomain);
-        ExitOnFailure(hr, "Failed to build user and domain name for CustomActionData");
-        hr = WcaWriteStringToCaData(wzDomainUser, &pwzCustomActionData);
-        ExitOnFailure(hr, "Failed to add server Domain\\UserName to CustomActionData");
-        hr = WcaWriteIntegerToCaData(pss->nPermissions, &pwzCustomActionData);
-        ExitOnFailure(hr, "Failed to add permissions to CustomActionData");
-    }
-    else
-    {
-        hr = WcaWriteIntegerToCaData(pss->nUserPermissionCount, &pwzCustomActionData);
-        ExitOnFailure(hr, "Failed to add additional user permission count to CustomActionData");
-    }
    if (pss->nUserPermissionCount > 0)
    {