[LSASRV][IDL] The first parameter of the Credr* functions is a PLSAPR_SERVER_NAME.
[reactos.git] / dll / win32 / lsasrv / lsarpc.c
index 4af41c4..925ca45 100644 (file)
 
 static RTL_CRITICAL_SECTION PolicyHandleTableLock;
 
+static
+GENERIC_MAPPING
+LsapPolicyMapping = {POLICY_READ,
+                     POLICY_WRITE,
+                     POLICY_EXECUTE,
+                     POLICY_ALL_ACCESS};
+
+static
+GENERIC_MAPPING
+LsapAccountMapping = {ACCOUNT_READ,
+                      ACCOUNT_WRITE,
+                      ACCOUNT_EXECUTE,
+                      ACCOUNT_ALL_ACCESS};
+
+static
+GENERIC_MAPPING
+LsapSecretMapping = {SECRET_READ,
+                     SECRET_WRITE,
+                     SECRET_EXECUTE,
+                     SECRET_ALL_ACCESS};
 
 /* FUNCTIONS ***************************************************************/
 
-VOID
+NTSTATUS
 LsarStartRpcServer(VOID)
 {
     RPC_STATUS Status;
+    DWORD dwError;
+    HANDLE hEvent;
 
     RtlInitializeCriticalSection(&PolicyHandleTableLock);
 
     TRACE("LsarStartRpcServer() called\n");
 
     Status = RpcServerUseProtseqEpW(L"ncacn_np",
-                                    10,
+                                    RPC_C_PROTSEQ_MAX_REQS_DEFAULT,
                                     L"\\pipe\\lsarpc",
                                     NULL);
     if (Status != RPC_S_OK)
     {
         WARN("RpcServerUseProtseqEpW() failed (Status %lx)\n", Status);
-        return;
+        return I_RpcMapWin32Status(Status);
     }
 
     Status = RpcServerRegisterIf(lsarpc_v0_0_s_ifspec,
@@ -41,17 +63,51 @@ LsarStartRpcServer(VOID)
     if (Status != RPC_S_OK)
     {
         WARN("RpcServerRegisterIf() failed (Status %lx)\n", Status);
-        return;
+        return I_RpcMapWin32Status(Status);
     }
 
+    DsSetupInit();
+
     Status = RpcServerListen(1, 20, TRUE);
     if (Status != RPC_S_OK)
     {
         WARN("RpcServerListen() failed (Status %lx)\n", Status);
-        return;
+        return I_RpcMapWin32Status(Status);
+    }
+
+    /* Notify the service manager */
+    TRACE("Creating notification event!\n");
+    hEvent = CreateEventW(NULL,
+                          TRUE,
+                          FALSE,
+                          L"LSA_RPC_SERVER_ACTIVE");
+    if (hEvent == NULL)
+    {
+        dwError = GetLastError();
+        TRACE("Failed to create or open the notification event (Error %lu)\n", dwError);
+#if 0
+        if (dwError == ERROR_ALREADY_EXISTS)
+        {
+            hEvent = OpenEventW(GENERIC_WRITE,
+                                FALSE,
+                                L"LSA_RPC_SERVER_ACTIVE");
+            if (hEvent == NULL)
+            {
+               ERR("Could not open the notification event (Error %lu)\n", GetLastError());
+               return STATUS_UNSUCCESSFUL;
+            }
+        }
+#endif
+        return STATUS_UNSUCCESSFUL;
     }
 
+    TRACE("Set notification event!\n");
+    SetEvent(hEvent);
+
+    /* NOTE: Do not close the event handle, as it must remain alive! */
+
     TRACE("LsarStartRpcServer() done\n");
+    return STATUS_SUCCESS;
 }
 
 
@@ -68,7 +124,7 @@ NTSTATUS WINAPI LsarClose(
     PLSA_DB_OBJECT DbObject;
     NTSTATUS Status = STATUS_SUCCESS;
 
-    TRACE("0x%p\n", ObjectHandle);
+    TRACE("LsarClose(%p)\n", ObjectHandle);
 
 //    RtlEnterCriticalSection(&PolicyHandleTableLock);
 
@@ -92,6 +148,8 @@ NTSTATUS WINAPI LsarClose(
 NTSTATUS WINAPI LsarDelete(
     LSAPR_HANDLE ObjectHandle)
 {
+    TRACE("LsarDelete(%p)\n", ObjectHandle);
+
     return LsarDeleteObject(&ObjectHandle);
 }
 
@@ -134,14 +192,21 @@ NTSTATUS WINAPI LsarQuerySecurityObject(
 {
     PLSA_DB_OBJECT DbObject = NULL;
     PSECURITY_DESCRIPTOR RelativeSd = NULL;
+    PSECURITY_DESCRIPTOR ResultSd = NULL;
     PLSAPR_SR_SECURITY_DESCRIPTOR SdData = NULL;
     ACCESS_MASK DesiredAccess = 0;
     ULONG RelativeSdSize = 0;
+    ULONG ResultSdSize = 0;
     NTSTATUS Status;
 
+    TRACE("LsarQuerySecurityObject(%p %lx %p)\n",
+          ObjectHandle, SecurityInformation, SecurityDescriptor);
+
     if (SecurityDescriptor == NULL)
         return STATUS_INVALID_PARAMETER;
 
+    *SecurityDescriptor = NULL;
+
     if ((SecurityInformation & OWNER_SECURITY_INFORMATION) ||
         (SecurityInformation & GROUP_SECURITY_INFORMATION) ||
         (SecurityInformation & DACL_SECURITY_INFORMATION))
@@ -179,10 +244,40 @@ NTSTATUS WINAPI LsarQuerySecurityObject(
     if (!NT_SUCCESS(Status))
         goto done;
 
-    /*
-     * FIXME: Invalidate the SD information that was not requested.
-     *        (see SecurityInformation)
-     */
+    /* Invalidate the SD information that was not requested */
+    if (!(SecurityInformation & OWNER_SECURITY_INFORMATION))
+        ((PISECURITY_DESCRIPTOR)RelativeSd)->Owner = NULL;
+
+    if (!(SecurityInformation & GROUP_SECURITY_INFORMATION))
+        ((PISECURITY_DESCRIPTOR)RelativeSd)->Group = NULL;
+
+    if (!(SecurityInformation & DACL_SECURITY_INFORMATION))
+        ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_DACL_PRESENT;
+
+    if (!(SecurityInformation & SACL_SECURITY_INFORMATION))
+        ((PISECURITY_DESCRIPTOR)RelativeSd)->Control &= ~SE_SACL_PRESENT;
+
+    /* Calculate the required SD size */
+    Status = RtlMakeSelfRelativeSD(RelativeSd,
+                                   NULL,
+                                   &ResultSdSize);
+    if (Status != STATUS_BUFFER_TOO_SMALL)
+        goto done;
+
+    /* Allocate a buffer for the new SD */
+    ResultSd = MIDL_user_allocate(ResultSdSize);
+    if (ResultSd == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    /* Build the new SD */
+    Status = RtlMakeSelfRelativeSD(RelativeSd,
+                                   ResultSd,
+                                   &ResultSdSize);
+    if (!NT_SUCCESS(Status))
+        goto done;
 
     /* Allocate the SD data buffer */
     SdData = MIDL_user_allocate(sizeof(LSAPR_SR_SECURITY_DESCRIPTOR));
@@ -194,17 +289,20 @@ NTSTATUS WINAPI LsarQuerySecurityObject(
 
     /* Fill the SD data buffer and return it to the caller */
     SdData->Length = RelativeSdSize;
-    SdData->SecurityDescriptor = (PBYTE)RelativeSd;
+    SdData->SecurityDescriptor = (PBYTE)ResultSd;
 
     *SecurityDescriptor = SdData;
 
 done:
     if (!NT_SUCCESS(Status))
     {
-        if (RelativeSd != NULL)
-            MIDL_user_free(RelativeSd);
+        if (ResultSd != NULL)
+            MIDL_user_free(ResultSd);
     }
 
+    if (RelativeSd != NULL)
+        MIDL_user_free(RelativeSd);
+
     return Status;
 }
 
@@ -215,8 +313,151 @@ NTSTATUS WINAPI LsarSetSecurityObject(
     SECURITY_INFORMATION SecurityInformation,
     PLSAPR_SR_SECURITY_DESCRIPTOR SecurityDescriptor)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    PLSA_DB_OBJECT DbObject = NULL;
+    ACCESS_MASK DesiredAccess = 0;
+    PSECURITY_DESCRIPTOR RelativeSd = NULL;
+    ULONG RelativeSdSize = 0;
+    HANDLE TokenHandle = NULL;
+    PGENERIC_MAPPING Mapping;
+    NTSTATUS Status;
+
+    TRACE("LsarSetSecurityObject(%p %lx %p)\n",
+          ObjectHandle, SecurityInformation, SecurityDescriptor);
+
+    if ((SecurityDescriptor == NULL) ||
+        (SecurityDescriptor->SecurityDescriptor == NULL) ||
+        !RtlValidSecurityDescriptor((PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor))
+        return ERROR_INVALID_PARAMETER;
+
+    if (SecurityInformation == 0 ||
+        SecurityInformation & ~(OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION
+        | DACL_SECURITY_INFORMATION | SACL_SECURITY_INFORMATION))
+        return ERROR_INVALID_PARAMETER;
+
+    if (SecurityInformation & SACL_SECURITY_INFORMATION)
+        DesiredAccess |= ACCESS_SYSTEM_SECURITY;
+
+    if (SecurityInformation & DACL_SECURITY_INFORMATION)
+        DesiredAccess |= WRITE_DAC;
+
+    if (SecurityInformation & (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION))
+        DesiredAccess |= WRITE_OWNER;
+
+    if ((SecurityInformation & OWNER_SECURITY_INFORMATION) &&
+        (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Owner == NULL))
+        return ERROR_INVALID_PARAMETER;
+
+    if ((SecurityInformation & GROUP_SECURITY_INFORMATION) &&
+        (((PISECURITY_DESCRIPTOR)SecurityDescriptor)->Group == NULL))
+        return ERROR_INVALID_PARAMETER;
+
+    /* Validate the ObjectHandle */
+    Status = LsapValidateDbObject(ObjectHandle,
+                                  LsaDbIgnoreObject,
+                                  DesiredAccess,
+                                  &DbObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject failed (Status 0x%08lx)\n", Status);
+        return Status;
+    }
+
+    /* Get the mapping for the object type */
+    switch (DbObject->ObjectType)
+    {
+        case LsaDbPolicyObject:
+            Mapping = &LsapPolicyMapping;
+            break;
+
+        case LsaDbAccountObject:
+            Mapping = &LsapAccountMapping;
+            break;
+
+//        case LsaDbDomainObject:
+//            Mapping = &LsapDomainMapping;
+//            break;
+
+        case LsaDbSecretObject:
+            Mapping = &LsapSecretMapping;
+            break;
+
+        default:
+            return STATUS_INVALID_HANDLE;
+    }
+
+    /* Get the size of the SD */
+    Status = LsapGetObjectAttribute(DbObject,
+                                    L"SecDesc",
+                                    NULL,
+                                    &RelativeSdSize);
+    if (!NT_SUCCESS(Status))
+        return Status;
+
+    /* Allocate a buffer for the SD */
+    RelativeSd = RtlAllocateHeap(RtlGetProcessHeap(), 0, RelativeSdSize);
+    if (RelativeSd == NULL)
+        return STATUS_INSUFFICIENT_RESOURCES;
+
+    /* Get the SD */
+    Status = LsapGetObjectAttribute(DbObject,
+                                    L"SecDesc",
+                                    RelativeSd,
+                                    &RelativeSdSize);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    /* Get the clients token if we try to set the owner */
+    if (SecurityInformation & OWNER_SECURITY_INFORMATION)
+    {
+        Status = I_RpcMapWin32Status(RpcImpersonateClient(NULL));
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("RpcImpersonateClient returns 0x%08lx\n", Status);
+            goto done;
+        }
+
+        Status = NtOpenThreadToken(NtCurrentThread(),
+                                   TOKEN_QUERY,
+                                   TRUE,
+                                   &TokenHandle);
+        RpcRevertToSelf();
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("NtOpenThreadToken returns 0x%08lx\n", Status);
+            goto done;
+        }
+    }
+
+    /* Build the new security descriptor */
+    Status = RtlSetSecurityObject(SecurityInformation,
+                                  (PSECURITY_DESCRIPTOR)SecurityDescriptor->SecurityDescriptor,
+                                  &RelativeSd,
+                                  Mapping,
+                                  TokenHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("RtlSetSecurityObject failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    /* Set the modified SD */
+    Status = LsapSetObjectAttribute(DbObject,
+                                    L"SecDesc",
+                                    RelativeSd,
+                                    RtlLengthSecurityDescriptor(RelativeSd));
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status);
+    }
+
+done:
+    if (TokenHandle != NULL)
+        NtClose(TokenHandle);
+
+    if (RelativeSd != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, RelativeSd);
+
+    return Status;
 }
 
 
@@ -244,7 +485,8 @@ NTSTATUS WINAPI LsarOpenPolicy(
     PLSA_DB_OBJECT PolicyObject;
     NTSTATUS Status;
 
-    TRACE("LsarOpenPolicy called!\n");
+    TRACE("LsarOpenPolicy(%S %p %lx %p)\n",
+          SystemName, ObjectAttributes, DesiredAccess, PolicyHandle);
 
     RtlEnterCriticalSection(&PolicyHandleTableLock);
 
@@ -465,21 +707,29 @@ NTSTATUS WINAPI LsarSetInformationPolicy(
         case PolicyAuditEventsInformation:   /* 2 */
             Status = LsarSetAuditEvents(PolicyObject,
                                         (PLSAPR_POLICY_AUDIT_EVENTS_INFO)PolicyInformation);
+            if (NT_SUCCESS(Status))
+                LsapNotifyPolicyChange(PolicyNotifyAuditEventsInformation);
             break;
 
         case PolicyPrimaryDomainInformation: /* 3 */
             Status = LsarSetPrimaryDomain(PolicyObject,
                                           (PLSAPR_POLICY_PRIMARY_DOM_INFO)PolicyInformation);
+            if (NT_SUCCESS(Status))
+                LsapNotifyPolicyChange(PolicyNotifyDnsDomainInformation);
             break;
 
         case PolicyAccountDomainInformation: /* 5 */
             Status = LsarSetAccountDomain(PolicyObject,
                                           (PLSAPR_POLICY_ACCOUNT_DOM_INFO)PolicyInformation);
+            if (NT_SUCCESS(Status))
+                LsapNotifyPolicyChange(PolicyNotifyAccountDomainInformation);
             break;
 
         case PolicyLsaServerRoleInformation: /* 6 */
             Status = LsarSetServerRole(PolicyObject,
                                        (PPOLICY_LSA_SERVER_ROLE_INFO)PolicyInformation);
+            if (NT_SUCCESS(Status))
+                LsapNotifyPolicyChange(PolicyNotifyServerRoleInformation);
             break;
 
         case PolicyReplicaSourceInformation: /* 7 */
@@ -505,6 +755,8 @@ NTSTATUS WINAPI LsarSetInformationPolicy(
         case PolicyDnsDomainInformation:      /* 12 (0xC) */
             Status = LsarSetDnsDomain(PolicyObject,
                                       (PLSAPR_POLICY_DNS_DOMAIN_INFO)PolicyInformation);
+            if (NT_SUCCESS(Status))
+                LsapNotifyPolicyChange(PolicyNotifyDnsDomainInformation);
             break;
 
         case PolicyDnsDomainInformationInt:   /* 13 (0xD) */
@@ -535,42 +787,24 @@ NTSTATUS WINAPI LsarClearAuditLog(
 }
 
 
-/* Function 10 */
-NTSTATUS WINAPI LsarCreateAccount(
-    LSAPR_HANDLE PolicyHandle,
+NTSTATUS
+LsarpCreateAccount(
+    PLSA_DB_OBJECT PolicyObject,
     PRPC_SID AccountSid,
     ACCESS_MASK DesiredAccess,
-    LSAPR_HANDLE *AccountHandle)
+    PLSA_DB_OBJECT *AccountObject)
 {
-    PLSA_DB_OBJECT PolicyObject;
-    PLSA_DB_OBJECT AccountObject = NULL;
     LPWSTR SidString = NULL;
     PSECURITY_DESCRIPTOR AccountSd = NULL;
     ULONG AccountSdSize;
     NTSTATUS Status = STATUS_SUCCESS;
 
-    /* Validate the AccountSid */
-    if (!RtlValidSid(AccountSid))
-        return STATUS_INVALID_PARAMETER;
-
-    /* Validate the PolicyHandle */
-    Status = LsapValidateDbObject(PolicyHandle,
-                                  LsaDbPolicyObject,
-                                  POLICY_CREATE_ACCOUNT,
-                                  &PolicyObject);
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
-        return Status;
-    }
-
     /* Create SID string */
     if (!ConvertSidToStringSid((PSID)AccountSid,
                                &SidString))
     {
         ERR("ConvertSidToStringSid failed\n");
-        Status = STATUS_INVALID_PARAMETER;
-        goto done;
+        return STATUS_INVALID_PARAMETER;
     }
 
     /* Create a security descriptor for the account */
@@ -579,7 +813,7 @@ NTSTATUS WINAPI LsarCreateAccount(
     if (!NT_SUCCESS(Status))
     {
         ERR("LsapCreateAccountSd returned 0x%08lx\n", Status);
-        return Status;
+        goto done;
     }
 
     /* Create the Account object */
@@ -589,7 +823,7 @@ NTSTATUS WINAPI LsarCreateAccount(
                                 LsaDbAccountObject,
                                 DesiredAccess,
                                 PolicyObject->Trusted,
-                                &AccountObject);
+                                AccountObject);
     if (!NT_SUCCESS(Status))
     {
         ERR("LsapCreateDbObject failed (Status 0x%08lx)\n", Status);
@@ -597,7 +831,7 @@ NTSTATUS WINAPI LsarCreateAccount(
     }
 
     /* Set the Sid attribute */
-    Status = LsapSetObjectAttribute(AccountObject,
+    Status = LsapSetObjectAttribute(*AccountObject,
                                     L"Sid",
                                     (PVOID)AccountSid,
                                     GetLengthSid(AccountSid));
@@ -605,7 +839,7 @@ NTSTATUS WINAPI LsarCreateAccount(
         goto done;
 
     /* Set the SecDesc attribute */
-    Status = LsapSetObjectAttribute(AccountObject,
+    Status = LsapSetObjectAttribute(*AccountObject,
                                     L"SecDesc",
                                     AccountSd,
                                     AccountSdSize);
@@ -617,17 +851,50 @@ done:
     if (AccountSd != NULL)
         RtlFreeHeap(RtlGetProcessHeap(), 0, AccountSd);
 
+    return Status;
+}
+
+
+/* Function 10 */
+NTSTATUS WINAPI LsarCreateAccount(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID AccountSid,
+    ACCESS_MASK DesiredAccess,
+    LSAPR_HANDLE *AccountHandle)
+{
+    PLSA_DB_OBJECT PolicyObject;
+    PLSA_DB_OBJECT AccountObject = NULL;
+    NTSTATUS Status = STATUS_SUCCESS;
+
+    TRACE("LsarCreateAccount(%p %p %lx %p)\n",
+          PolicyHandle, AccountSid, DesiredAccess, AccountHandle);
+
+    /* Validate the AccountSid */
+    if (!RtlValidSid(AccountSid))
+        return STATUS_INVALID_PARAMETER;
+
+    /* Validate the PolicyHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_CREATE_ACCOUNT,
+                                  &PolicyObject);
     if (!NT_SUCCESS(Status))
     {
-        if (AccountObject != NULL)
-            LsapCloseDbObject(AccountObject);
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
     }
-    else
+
+
+    Status = LsarpCreateAccount(PolicyObject,
+                                AccountSid,
+                                DesiredAccess,
+                                &AccountObject);
+    if (NT_SUCCESS(Status))
     {
         *AccountHandle = (LSAPR_HANDLE)AccountObject;
     }
 
-    return STATUS_SUCCESS;
+    return Status;
 }
 
 
@@ -640,10 +907,11 @@ NTSTATUS WINAPI LsarEnumerateAccounts(
 {
     LSAPR_ACCOUNT_ENUM_BUFFER EnumBuffer = {0, NULL};
     PLSA_DB_OBJECT PolicyObject = NULL;
-    WCHAR AccountKeyName[64];
+    PWSTR AccountKeyBuffer = NULL;
     HANDLE AccountsKeyHandle = NULL;
     HANDLE AccountKeyHandle;
     HANDLE SidKeyHandle;
+    ULONG AccountKeyBufferSize;
     ULONG EnumIndex;
     ULONG EnumCount;
     ULONG RequiredLength;
@@ -651,8 +919,8 @@ NTSTATUS WINAPI LsarEnumerateAccounts(
     ULONG i;
     NTSTATUS Status = STATUS_SUCCESS;
 
-    TRACE("(%p %p %p %lu)\n", PolicyHandle, EnumerationContext,
-          EnumerationBuffer, PreferedMaximumLength);
+    TRACE("LsarEnumerateAccount(%p %p %p %lu)\n",
+          PolicyHandle, EnumerationContext, EnumerationBuffer, PreferedMaximumLength);
 
     if (EnumerationContext == NULL ||
         EnumerationBuffer == NULL)
@@ -679,6 +947,23 @@ NTSTATUS WINAPI LsarEnumerateAccounts(
     if (!NT_SUCCESS(Status))
         return Status;
 
+    Status = LsapRegQueryKeyInfo(AccountsKeyHandle,
+                                 NULL,
+                                 &AccountKeyBufferSize,
+                                 NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapRegQueryKeyInfo returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    AccountKeyBufferSize += sizeof(WCHAR);
+    AccountKeyBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, AccountKeyBufferSize);
+    if (AccountKeyBuffer == NULL)
+    {
+        return STATUS_NO_MEMORY;
+    }
+
     EnumIndex = *EnumerationContext;
     EnumCount = 0;
     RequiredLength = 0;
@@ -687,16 +972,16 @@ NTSTATUS WINAPI LsarEnumerateAccounts(
     {
         Status = LsapRegEnumerateSubKey(AccountsKeyHandle,
                                         EnumIndex,
-                                        64 * sizeof(WCHAR),
-                                        AccountKeyName);
+                                        AccountKeyBufferSize,
+                                        AccountKeyBuffer);
         if (!NT_SUCCESS(Status))
             break;
 
         TRACE("EnumIndex: %lu\n", EnumIndex);
-        TRACE("Account key name: %S\n", AccountKeyName);
+        TRACE("Account key name: %S\n", AccountKeyBuffer);
 
         Status = LsapRegOpenKey(AccountsKeyHandle,
-                                AccountKeyName,
+                                AccountKeyBuffer,
                                 KEY_READ,
                                 &AccountKeyHandle);
         TRACE("LsapRegOpenKey returned %08lX\n", Status);
@@ -752,16 +1037,16 @@ NTSTATUS WINAPI LsarEnumerateAccounts(
     {
         Status = LsapRegEnumerateSubKey(AccountsKeyHandle,
                                         EnumIndex,
-                                        64 * sizeof(WCHAR),
-                                        AccountKeyName);
+                                        AccountKeyBufferSize,
+                                        AccountKeyBuffer);
         if (!NT_SUCCESS(Status))
             break;
 
         TRACE("EnumIndex: %lu\n", EnumIndex);
-        TRACE("Account key name: %S\n", AccountKeyName);
+        TRACE("Account key name: %S\n", AccountKeyBuffer);
 
         Status = LsapRegOpenKey(AccountsKeyHandle,
-                                AccountKeyName,
+                                AccountKeyBuffer,
                                 KEY_READ,
                                 &AccountKeyHandle);
         TRACE("LsapRegOpenKey returned %08lX\n", Status);
@@ -831,6 +1116,9 @@ done:
         }
     }
 
+    if (AccountKeyBuffer != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, AccountKeyBuffer);
+
     if (AccountsKeyHandle != NULL)
         LsapRegCloseKey(AccountsKeyHandle);
 
@@ -845,8 +1133,8 @@ NTSTATUS WINAPI LsarCreateTrustedDomain(
     ACCESS_MASK DesiredAccess,
     LSAPR_HANDLE *TrustedDomainHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
 }
 
 
@@ -857,8 +1145,10 @@ NTSTATUS WINAPI LsarEnumerateTrustedDomains(
     PLSAPR_TRUSTED_ENUM_BUFFER EnumerationBuffer,
     DWORD PreferedMaximumLength)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    EnumerationBuffer->EntriesRead = 0;
+    EnumerationBuffer->Information = NULL;
+    return STATUS_NO_MORE_ENTRIES;
 }
 
 
@@ -876,7 +1166,7 @@ NTSTATUS WINAPI LsarLookupNames(
     ULONG i;
     NTSTATUS Status;
 
-    TRACE("(%p %lu %p %p %p %d %p)\n",
+    TRACE("LsarLookupNames(%p %lu %p %p %p %d %p)\n",
           PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids,
           LookupLevel, MappedCount);
 
@@ -937,7 +1227,7 @@ NTSTATUS WINAPI LsarLookupSids(
     ULONG i;
     NTSTATUS Status;
 
-    TRACE("(%p %p %p %p %d %p)\n",
+    TRACE("LsarLookupSids(%p %p %p %p %d %p)\n",
           PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames,
           LookupLevel, MappedCount);
 
@@ -999,6 +1289,9 @@ NTSTATUS WINAPI LsarCreateSecret(
     ULONG SecretSdSize;
     NTSTATUS Status = STATUS_SUCCESS;
 
+    TRACE("LsarCreateSecret(%p %wZ %lx %p)\n",
+          PolicyHandle, SecretName, DesiredAccess, SecretHandle);
+
     /* Validate the PolicyHandle */
     Status = LsapValidateDbObject(PolicyHandle,
                                   LsaDbPolicyObject,
@@ -1087,40 +1380,23 @@ done:
 }
 
 
-/* Function 17 */
-NTSTATUS WINAPI LsarOpenAccount(
-    LSAPR_HANDLE PolicyHandle,
-    PRPC_SID AccountSid,
-    ACCESS_MASK DesiredAccess,
-    LSAPR_HANDLE *AccountHandle)
+static
+NTSTATUS
+LsarpOpenAccount(
+    IN PLSA_DB_OBJECT PolicyObject,
+    IN PRPC_SID AccountSid,
+    IN ACCESS_MASK DesiredAccess,
+    OUT PLSA_DB_OBJECT *AccountObject)
 {
-    PLSA_DB_OBJECT PolicyObject;
-    PLSA_DB_OBJECT AccountObject = NULL;
     LPWSTR SidString = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
 
-    /* Validate the AccountSid */
-    if (!RtlValidSid(AccountSid))
-        return STATUS_INVALID_PARAMETER;
-
-    /* Validate the PolicyHandle */
-    Status = LsapValidateDbObject(PolicyHandle,
-                                  LsaDbPolicyObject,
-                                  0,
-                                  &PolicyObject);
-    if (!NT_SUCCESS(Status))
-    {
-        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
-        return Status;
-    }
-
     /* Create SID string */
     if (!ConvertSidToStringSid((PSID)AccountSid,
                                &SidString))
     {
         ERR("ConvertSidToStringSid failed\n");
-        Status = STATUS_INVALID_PARAMETER;
-        goto done;
+        return STATUS_INVALID_PARAMETER;
     }
 
     /* Create the Account object */
@@ -1130,47 +1406,69 @@ NTSTATUS WINAPI LsarOpenAccount(
                               LsaDbAccountObject,
                               DesiredAccess,
                               PolicyObject->Trusted,
-                              &AccountObject);
+                              AccountObject);
     if (!NT_SUCCESS(Status))
     {
-        ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status);
-        goto done;
+        ERR("LsapOpenDbObject(Accounts/%S) failed (Status 0x%08lx)\n", SidString, Status);
     }
 
-    /* Set the Sid attribute */
-    Status = LsapSetObjectAttribute(AccountObject,
-                                    L"Sid",
-                                    (PVOID)AccountSid,
-                                    GetLengthSid(AccountSid));
-
-done:
     if (SidString != NULL)
         LocalFree(SidString);
 
-    if (!NT_SUCCESS(Status))
-    {
-        if (AccountObject != NULL)
-            LsapCloseDbObject(AccountObject);
-    }
-    else
-    {
-        *AccountHandle = (LSAPR_HANDLE)AccountObject;
-    }
-
     return Status;
 }
 
 
-/* Function 18 */
-NTSTATUS WINAPI LsarEnumeratePrivilegesAccount(
-    LSAPR_HANDLE AccountHandle,
-    PLSAPR_PRIVILEGE_SET *Privileges)
+/* Function 17 */
+NTSTATUS WINAPI LsarOpenAccount(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID AccountSid,
+    ACCESS_MASK DesiredAccess,
+    LSAPR_HANDLE *AccountHandle)
 {
-    PLSA_DB_OBJECT AccountObject;
+    PLSA_DB_OBJECT PolicyObject;
+    NTSTATUS Status;
+
+    TRACE("LsarOpenAccount(%p %p %lx %p)\n",
+          PolicyHandle, AccountSid, DesiredAccess, AccountHandle);
+
+    /* Validate the AccountSid */
+    if (!RtlValidSid(AccountSid))
+        return STATUS_INVALID_PARAMETER;
+
+    /* Validate the PolicyHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  0,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+
+    /* Open the Account object */
+    return LsarpOpenAccount(PolicyObject,
+                            AccountSid,
+                            DesiredAccess,
+                            (PLSA_DB_OBJECT *)AccountHandle);
+}
+
+
+/* Function 18 */
+NTSTATUS WINAPI LsarEnumeratePrivilegesAccount(
+    LSAPR_HANDLE AccountHandle,
+    PLSAPR_PRIVILEGE_SET *Privileges)
+{
+    PLSA_DB_OBJECT AccountObject;
     ULONG PrivilegeSetSize = 0;
     PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL;
     NTSTATUS Status;
 
+    TRACE("LsarEnumeratePrivilegesAccount(%p %p)\n",
+          AccountHandle, Privileges);
+
     *Privileges = NULL;
 
     /* Validate the AccountHandle */
@@ -1229,6 +1527,9 @@ NTSTATUS WINAPI LsarAddPrivilegesToAccount(
     BOOL bFound;
     NTSTATUS Status;
 
+    TRACE("LsarAddPrivilegesToAccount(%p %p)\n",
+          AccountHandle, Privileges);
+
     /* Validate the AccountHandle */
     Status = LsapValidateDbObject(AccountHandle,
                                   LsaDbAccountObject,
@@ -1279,7 +1580,7 @@ NTSTATUS WINAPI LsarAddPrivilegesToAccount(
         PrivilegeCount = CurrentPrivileges->PrivilegeCount;
         TRACE("Current privilege count: %lu\n", PrivilegeCount);
 
-        /* Calculate the number privileges in the combined privilege set */
+        /* Calculate the number of privileges in the combined privilege set */
         for (i = 0; i < Privileges->PrivilegeCount; i++)
         {
             bFound = FALSE;
@@ -1369,7 +1670,7 @@ done:
 /* Function 20 */
 NTSTATUS WINAPI LsarRemovePrivilegesFromAccount(
     LSAPR_HANDLE AccountHandle,
-    BOOL AllPrivileges,
+    BOOLEAN AllPrivileges,
     PLSAPR_PRIVILEGE_SET Privileges)
 {
     PLSA_DB_OBJECT AccountObject;
@@ -1381,11 +1682,12 @@ NTSTATUS WINAPI LsarRemovePrivilegesFromAccount(
     BOOL bFound;
     NTSTATUS Status;
 
-    TRACE("(%p %u %p)\n", AccountHandle, AllPrivileges, Privileges);
+    TRACE("LsarRemovePrivilegesFromAccount(%p %u %p)\n",
+          AccountHandle, AllPrivileges, Privileges);
 
     /* */
-    if ((AllPrivileges == FALSE && Privileges == NULL) ||
-        (AllPrivileges == TRUE && Privileges != NULL))
+    if (((AllPrivileges == FALSE) && (Privileges == NULL)) ||
+        ((AllPrivileges != FALSE) && (Privileges != NULL)))
             return STATUS_INVALID_PARAMETER;
 
     /* Validate the AccountHandle */
@@ -1399,7 +1701,7 @@ NTSTATUS WINAPI LsarRemovePrivilegesFromAccount(
         return Status;
     }
 
-    if (AllPrivileges == TRUE)
+    if (AllPrivileges != FALSE)
     {
         /* Delete the Privilgs attribute */
         Status = LsapDeleteObjectAttribute(AccountObject,
@@ -1531,7 +1833,8 @@ NTSTATUS WINAPI LsarGetQuotasForAccount(
     ULONG Size;
     NTSTATUS Status;
 
-    TRACE("(%p %p)\n", AccountHandle, QuotaLimits);
+    TRACE("LsarGetQuotasForAccount(%p %p)\n",
+          AccountHandle, QuotaLimits);
 
     /* Validate the account handle */
     Status = LsapValidateDbObject(AccountHandle,
@@ -1564,7 +1867,8 @@ NTSTATUS WINAPI LsarSetQuotasForAccount(
     ULONG Size;
     NTSTATUS Status;
 
-    TRACE("(%p %p)\n", AccountHandle, QuotaLimits);
+    TRACE("LsarSetQuotasForAccount(%p %p)\n",
+          AccountHandle, QuotaLimits);
 
     /* Validate the account handle */
     Status = LsapValidateDbObject(AccountHandle,
@@ -1621,9 +1925,12 @@ NTSTATUS WINAPI LsarGetSystemAccessAccount(
     ACCESS_MASK *SystemAccess)
 {
     PLSA_DB_OBJECT AccountObject;
-    ULONG Size;
+    ULONG Size = sizeof(ACCESS_MASK);
     NTSTATUS Status;
 
+    TRACE("LsarGetSystemAccessAccount(%p %p)\n",
+          AccountHandle, SystemAccess);
+
     /* Validate the account handle */
     Status = LsapValidateDbObject(AccountHandle,
                                   LsaDbAccountObject,
@@ -1653,6 +1960,9 @@ NTSTATUS WINAPI LsarSetSystemAccessAccount(
     PLSA_DB_OBJECT AccountObject;
     NTSTATUS Status;
 
+    TRACE("LsarSetSystemAccessAccount(%p %lx)\n",
+          AccountHandle, SystemAccess);
+
     /* Validate the account handle */
     Status = LsapValidateDbObject(AccountHandle,
                                   LsaDbAccountObject,
@@ -1719,6 +2029,9 @@ NTSTATUS WINAPI LsarOpenSecret(
     PLSA_DB_OBJECT SecretObject = NULL;
     NTSTATUS Status = STATUS_SUCCESS;
 
+    TRACE("LsarOpenSecret(%p %wZ %lx %p)\n",
+          PolicyHandle, SecretName, DesiredAccess, SecretHandle);
+
     /* Validate the PolicyHandle */
     Status = LsapValidateDbObject(PolicyHandle,
                                   LsaDbPolicyObject,
@@ -2043,6 +2356,7 @@ NTSTATUS WINAPI LsarLookupPrivilegeValue(
     PRPC_UNICODE_STRING Name,
     PLUID Value)
 {
+    PLUID pValue;
     NTSTATUS Status;
 
     TRACE("LsarLookupPrivilegeValue(%p, %wZ, %p)\n",
@@ -2060,10 +2374,13 @@ NTSTATUS WINAPI LsarLookupPrivilegeValue(
 
     TRACE("Privilege: %wZ\n", Name);
 
-    Status = LsarpLookupPrivilegeValue(Name,
-                                       Value);
+    pValue = LsarpLookupPrivilegeValue(Name);
+    if (pValue == NULL)
+        return STATUS_NO_SUCH_PRIVILEGE;
 
-    return Status;
+    RtlCopyLuid(Value, pValue);
+
+    return STATUS_SUCCESS;
 }
 
 
@@ -2104,8 +2421,28 @@ NTSTATUS WINAPI LsarLookupPrivilegeDisplayName(
     PRPC_UNICODE_STRING *DisplayName,
     USHORT *LanguageReturned)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    NTSTATUS Status;
+
+    TRACE("LsarLookupPrivilegeDisplayName(%p, %p, %u, %u, %p, %p)\n",
+          PolicyHandle, Name, ClientLanguage, ClientSystemDefaultLanguage, DisplayName, LanguageReturned);
+
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_LOOKUP_NAMES,
+                                  NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("Invalid handle\n");
+        return Status;
+    }
+
+    Status = LsarpLookupPrivilegeDisplayName(Name,
+                                             ClientLanguage,
+                                             ClientSystemDefaultLanguage,
+                                             DisplayName,
+                                             LanguageReturned);
+
+    return Status;
 }
 
 
@@ -2116,7 +2453,7 @@ NTSTATUS WINAPI LsarDeleteObject(
     PLSA_DB_OBJECT DbObject;
     NTSTATUS Status;
 
-    TRACE("(%p)\n", ObjectHandle);
+    TRACE("LsarDeleteObject(%p)\n", ObjectHandle);
 
     if (ObjectHandle == NULL)
         return STATUS_INVALID_PARAMETER;
@@ -2157,8 +2494,274 @@ NTSTATUS WINAPI LsarEnumerateAccountsWithUserRight(
     PRPC_UNICODE_STRING UserRight,
     PLSAPR_ACCOUNT_ENUM_BUFFER EnumerationBuffer)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    PLSA_DB_OBJECT PolicyObject;
+    ACCESS_MASK AccountRight = 0;
+    PLUID Luid = NULL;
+    ULONG AccountKeyBufferSize;
+    PWSTR AccountKeyBuffer = NULL;
+    HKEY AccountsKeyHandle = NULL;
+    HKEY AccountKeyHandle = NULL;
+    HKEY AttributeKeyHandle;
+    ACCESS_MASK SystemAccess;
+    PPRIVILEGE_SET PrivilegeSet;
+    PLSAPR_ACCOUNT_INFORMATION EnumBuffer = NULL, ReturnBuffer;
+    ULONG SubKeyCount = 0;
+    ULONG EnumIndex, EnumCount;
+    ULONG Size, i;
+    BOOL Found;
+    NTSTATUS Status;
+
+    TRACE("LsarEnumerateAccountsWithUserRights(%p %wZ %p)\n",
+          PolicyHandle, UserRight, EnumerationBuffer);
+
+    /* Validate the privilege and account right names */
+    if (UserRight != NULL)
+    {
+        Luid = LsarpLookupPrivilegeValue(UserRight);
+        if (Luid == NULL)
+        {
+            AccountRight = LsapLookupAccountRightValue(UserRight);
+            if (AccountRight == 0)
+                return STATUS_NO_SUCH_PRIVILEGE;
+        }
+    }
+
+    if (EnumerationBuffer == NULL)
+        return STATUS_INVALID_PARAMETER;
+
+    EnumerationBuffer->EntriesRead = 0;
+    EnumerationBuffer->Information = NULL;
+
+    /* Validate the PolicyHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_LOOKUP_NAMES | POLICY_VIEW_LOCAL_INFORMATION,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    Status = LsapRegOpenKey(PolicyObject->KeyHandle,
+                            L"Accounts",
+                            KEY_READ,
+                            &AccountsKeyHandle);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapRegOpenKey returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    Status = LsapRegQueryKeyInfo(AccountsKeyHandle,
+                                 &SubKeyCount,
+                                 &AccountKeyBufferSize,
+                                 NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapRegOpenKey returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    AccountKeyBufferSize += sizeof(WCHAR);
+    AccountKeyBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, AccountKeyBufferSize);
+    if (AccountKeyBuffer == NULL)
+    {
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    EnumBuffer = RtlAllocateHeap(RtlGetProcessHeap(),
+                                 HEAP_ZERO_MEMORY,
+                                 SubKeyCount * sizeof(LSAPR_ACCOUNT_INFORMATION));
+    if (EnumBuffer == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    EnumCount = 0;
+    EnumIndex = 0;
+    while (TRUE)
+    {
+        Found = FALSE;
+
+        Status = LsapRegEnumerateSubKey(AccountsKeyHandle,
+                                        EnumIndex,
+                                        AccountKeyBufferSize,
+                                        AccountKeyBuffer);
+        if (!NT_SUCCESS(Status))
+        {
+            if (Status == STATUS_NO_MORE_ENTRIES)
+                Status = STATUS_SUCCESS;
+            break;
+        }
+
+        TRACE("EnumIndex: %lu\n", EnumIndex);
+        TRACE("Account key name: %S\n", AccountKeyBuffer);
+
+        Status = LsapRegOpenKey(AccountsKeyHandle,
+                                AccountKeyBuffer,
+                                KEY_READ,
+                                &AccountKeyHandle);
+        if (NT_SUCCESS(Status))
+        {
+            if (Luid != NULL || AccountRight != 0)
+            {
+                Status = LsapRegOpenKey(AccountKeyHandle,
+                                        (Luid != NULL) ? L"Privilgs" : L"ActSysAc",
+                                        KEY_READ,
+                                        &AttributeKeyHandle);
+                if (NT_SUCCESS(Status))
+                {
+                    if (Luid != NULL)
+                    {
+                        Size = 0;
+                        LsapRegQueryValue(AttributeKeyHandle,
+                                          NULL,
+                                          NULL,
+                                          NULL,
+                                          &Size);
+                        if (Size != 0)
+                        {
+                            PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(), 0, Size);
+                            if (PrivilegeSet)
+                            {
+                                if (LsapRegQueryValue(AttributeKeyHandle,
+                                                      NULL,
+                                                      NULL,
+                                                      PrivilegeSet,
+                                                      &Size) == STATUS_SUCCESS)
+                                {
+                                    for (i = 0; i < PrivilegeSet->PrivilegeCount; i++)
+                                    {
+                                        if (RtlEqualLuid(&(PrivilegeSet->Privilege[i].Luid), Luid))
+                                        {
+                                            TRACE("%S got the privilege!\n", AccountKeyBuffer);
+                                            Found = TRUE;
+                                            break;
+                                        }
+                                    }
+                                }
+
+                                RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet);
+                            }
+                        }
+                    }
+                    else if (AccountRight != 0)
+                    {
+                        SystemAccess = 0;
+                        Size = sizeof(ACCESS_MASK);
+                        LsapRegQueryValue(AttributeKeyHandle,
+                                          NULL,
+                                          NULL,
+                                          &SystemAccess,
+                                          &Size);
+                        if (SystemAccess & AccountRight)
+                        {
+                            TRACE("%S got the account right!\n", AccountKeyBuffer);
+                            Found = TRUE;
+                        }
+                    }
+
+                    LsapRegCloseKey(AttributeKeyHandle);
+                }
+            }
+            else
+            {
+                /* enumerate all accounts */
+                Found = TRUE;
+            }
+
+            if (Found == TRUE)
+            {
+                TRACE("Add account: %S\n", AccountKeyBuffer);
+
+                Status = LsapRegOpenKey(AccountKeyHandle,
+                                        L"Sid",
+                                        KEY_READ,
+                                        &AttributeKeyHandle);
+                if (NT_SUCCESS(Status))
+                {
+                    Size = 0;
+                    LsapRegQueryValue(AttributeKeyHandle,
+                                      NULL,
+                                      NULL,
+                                      NULL,
+                                      &Size);
+                    if (Size != 0)
+                    {
+                        EnumBuffer[EnumCount].Sid = midl_user_allocate(Size);
+                        if (EnumBuffer[EnumCount].Sid != NULL)
+                        {
+                            Status = LsapRegQueryValue(AttributeKeyHandle,
+                                                       NULL,
+                                                       NULL,
+                                                       EnumBuffer[EnumCount].Sid,
+                                                       &Size);
+                            if (NT_SUCCESS(Status))
+                            {
+                                EnumCount++;
+                            }
+                            else
+                            {
+                                TRACE("SampRegQueryValue returned %08lX\n", Status);
+                                midl_user_free(EnumBuffer[EnumCount].Sid);
+                                EnumBuffer[EnumCount].Sid = NULL;
+                            }
+                        }
+                    }
+
+                    LsapRegCloseKey(AttributeKeyHandle);
+                }
+            }
+
+            LsapRegCloseKey(AccountKeyHandle);
+        }
+
+        EnumIndex++;
+    }
+
+    TRACE("EnumCount: %lu\n", EnumCount);
+
+    if (NT_SUCCESS(Status) && EnumCount != 0)
+    {
+        ReturnBuffer = midl_user_allocate(EnumCount * sizeof(LSAPR_ACCOUNT_INFORMATION));
+        if (ReturnBuffer == NULL)
+        {
+            Status = STATUS_INSUFFICIENT_RESOURCES;
+            goto done;
+        }
+
+        RtlCopyMemory(ReturnBuffer,
+                      EnumBuffer,
+                      EnumCount * sizeof(LSAPR_ACCOUNT_INFORMATION));
+
+        EnumerationBuffer->EntriesRead = EnumCount;
+        EnumerationBuffer->Information = ReturnBuffer;
+    }
+
+done:
+    if (EnumBuffer != NULL)
+    {
+        if (Status != STATUS_SUCCESS)
+        {
+            for (i = 0; i < EnumCount; i++)
+            {
+                if (EnumBuffer[i].Sid != NULL)
+                    midl_user_free(EnumBuffer[i].Sid);
+            }
+        }
+
+        RtlFreeHeap(RtlGetProcessHeap(), 0, EnumBuffer);
+    }
+
+    if (AccountKeyBuffer != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, AccountKeyBuffer);
+
+    if (Status == STATUS_SUCCESS && EnumCount == 0)
+        Status = STATUS_NO_MORE_ENTRIES;
+
+    return Status;
 }
 
 
@@ -2172,9 +2775,9 @@ NTSTATUS WINAPI LsarEnumerateAccountRights(
     PLSAPR_PRIVILEGE_SET PrivilegeSet = NULL;
     PRPC_UNICODE_STRING RightsBuffer = NULL;
     PRPC_UNICODE_STRING PrivilegeString;
-    ACCESS_MASK SystemAccess;
+    ACCESS_MASK SystemAccess = 0;
     ULONG RightsCount = 0;
-    ULONG RightsIndex;
+    ULONG Index;
     ULONG i;
     NTSTATUS Status;
 
@@ -2188,25 +2791,25 @@ NTSTATUS WINAPI LsarEnumerateAccountRights(
                              &AccountHandle);
     if (!NT_SUCCESS(Status))
     {
-        ERR("LsarOpenAccount returned 0x%08lx\n", Status);
+        WARN("LsarOpenAccount returned 0x%08lx\n", Status);
         return Status;
     }
 
     /* Enumerate the privileges */
     Status = LsarEnumeratePrivilegesAccount(AccountHandle,
                                             &PrivilegeSet);
-    if (!NT_SUCCESS(Status))
+    if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
     {
-        ERR("LsarEnumeratePrivilegesAccount returned 0x%08lx\n", Status);
+        WARN("LsarEnumeratePrivilegesAccount returned 0x%08lx\n", Status);
         goto done;
     }
 
     /* Get account rights */
     Status = LsarGetSystemAccessAccount(AccountHandle,
                                         &SystemAccess);
-    if (!NT_SUCCESS(Status))
+    if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
     {
-        ERR("LsarGetSystemAccessAccount returned 0x%08lx\n", Status);
+        WARN("LsarGetSystemAccessAccount returned 0x%08lx\n", Status);
         goto done;
     }
 
@@ -2237,22 +2840,28 @@ NTSTATUS WINAPI LsarEnumerateAccountRights(
     }
 
     /* Copy the privileges into the buffer */
-    RightsIndex = 0;
-    for (i = 0; i < PrivilegeSet->PrivilegeCount; i++)
+    Index = 0;
+    if (PrivilegeSet)
     {
-        PrivilegeString = NULL;
-        Status = LsarLookupPrivilegeName(PolicyHandle,
-                                         (PLUID)&PrivilegeSet->Privilege[i].Luid,
-                                         &PrivilegeString);
-        if (!NT_SUCCESS(Status))
-            goto done;
+        for (i = 0; i < PrivilegeSet->PrivilegeCount; i++)
+        {
+            PrivilegeString = NULL;
+            Status = LsarLookupPrivilegeName(PolicyHandle,
+                                             (PLUID)&PrivilegeSet->Privilege[i].Luid,
+                                             &PrivilegeString);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN("LsarLookupPrivilegeName returned 0x%08lx\n", Status);
+                goto done;
+            }
 
-        RightsBuffer[i].Length = PrivilegeString->Length;
-        RightsBuffer[i].MaximumLength = PrivilegeString->MaximumLength;
-        RightsBuffer[i].Buffer = PrivilegeString->Buffer;
+            RightsBuffer[Index].Length = PrivilegeString->Length;
+            RightsBuffer[Index].MaximumLength = PrivilegeString->MaximumLength;
+            RightsBuffer[Index].Buffer = PrivilegeString->Buffer;
 
-        MIDL_user_free(PrivilegeString);
-        RightsIndex++;
+            MIDL_user_free(PrivilegeString);
+            Index++;
+        }
     }
 
     /* Copy account rights into the buffer */
@@ -2263,14 +2872,17 @@ NTSTATUS WINAPI LsarEnumerateAccountRights(
             Status = LsapLookupAccountRightName(1 << i,
                                                 &PrivilegeString);
             if (!NT_SUCCESS(Status))
+            {
+                WARN("LsarLookupAccountRightName returned 0x%08lx\n", Status);
                 goto done;
+            }
 
-            RightsBuffer[i].Length = PrivilegeString->Length;
-            RightsBuffer[i].MaximumLength = PrivilegeString->MaximumLength;
-            RightsBuffer[i].Buffer = PrivilegeString->Buffer;
+            RightsBuffer[Index].Length = PrivilegeString->Length;
+            RightsBuffer[Index].MaximumLength = PrivilegeString->MaximumLength;
+            RightsBuffer[Index].Buffer = PrivilegeString->Buffer;
 
             MIDL_user_free(PrivilegeString);
-            RightsIndex++;
+            Index++;
         }
     }
 
@@ -2282,10 +2894,10 @@ done:
     {
         if (RightsBuffer != NULL)
         {
-            for (RightsIndex = 0; RightsIndex < RightsCount; RightsIndex++)
+            for (Index = 0; Index < RightsCount; Index++)
             {
-                if (RightsBuffer[RightsIndex].Buffer != NULL)
-                    MIDL_user_free(RightsBuffer[RightsIndex].Buffer);
+                if (RightsBuffer[Index].Buffer != NULL)
+                    MIDL_user_free(RightsBuffer[Index].Buffer);
             }
 
             MIDL_user_free(RightsBuffer);
@@ -2307,55 +2919,435 @@ NTSTATUS WINAPI LsarAddAccountRights(
     PRPC_SID AccountSid,
     PLSAPR_USER_RIGHT_SET UserRights)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
+    PLSA_DB_OBJECT PolicyObject;
+    PLSA_DB_OBJECT AccountObject = NULL;
+    ULONG ulNewPrivileges = 0, ulNewRights = 0;
+    ACCESS_MASK SystemAccess = 0;
+    ULONG Size, Value, i, j;
+    PPRIVILEGE_SET PrivilegeSet = NULL;
+    ULONG PrivilegeSetBufferSize = 0;
+    ULONG PrivilegeCount;
+    BOOLEAN bFound;
+    PLUID pLuid;
+    NTSTATUS Status;
 
+    TRACE("LsarAddAccountRights(%p %p %p)\n",
+          PolicyHandle, AccountSid, UserRights);
 
-/* Function 38 */
-NTSTATUS WINAPI LsarRemoveAccountRights(
-    LSAPR_HANDLE PolicyHandle,
-    PRPC_SID AccountSid,
-    BOOL AllRights,
-    PLSAPR_USER_RIGHT_SET UserRights)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
+    /* Validate the AccountSid */
+    if (!RtlValidSid(AccountSid))
+        return STATUS_INVALID_PARAMETER;
 
+    /* Validate the UserRights */
+    if (UserRights == NULL)
+        return STATUS_INVALID_PARAMETER;
 
-/* Function 39 */
-NTSTATUS WINAPI LsarQueryTrustedDomainInfo(
-    LSAPR_HANDLE PolicyHandle,
-    PRPC_SID TrustedDomainSid,
-    TRUSTED_INFORMATION_CLASS InformationClass,
-    PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
+    /* Validate the privilege and account right names */
+    for (i = 0; i < UserRights->Entries; i++)
+    {
+        if (LsarpLookupPrivilegeValue(&UserRights->UserRights[i]) != NULL)
+        {
+            ulNewPrivileges++;
+        }
+        else
+        {
+            if (LsapLookupAccountRightValue(&UserRights->UserRights[i]) == 0)
+                return STATUS_NO_SUCH_PRIVILEGE;
 
+            ulNewRights++;
+        }
+    }
 
-/* Function 40 */
-NTSTATUS WINAPI LsarSetTrustedDomainInfo(
-    LSAPR_HANDLE PolicyHandle,
-    PRPC_SID TrustedDomainSid,
-    TRUSTED_INFORMATION_CLASS InformationClass,
-    PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
+    TRACE("ulNewPrivileges: %lu\n", ulNewPrivileges);
+    TRACE("ulNewRights: %lu\n", ulNewRights);
 
+    /* Validate the PolicyHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_LOOKUP_NAMES,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        WARN("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
 
-/* Function 41 */
-NTSTATUS WINAPI LsarDeleteTrustedDomain(
-    LSAPR_HANDLE PolicyHandle,
-    PRPC_SID TrustedDomainSid)
-{
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
-}
+    /* Open the account */
+    Status = LsarpOpenAccount(PolicyObject,
+                              AccountSid,
+                              0,
+                              &AccountObject);
+    if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+    {
+        WARN("LsarpOpenAccount returned 0x%08lx\n", Status);
+        goto done;
+    }
+    else if (Status == STATUS_OBJECT_NAME_NOT_FOUND)
+    {
+        /* Create a new account if it does not yet exist */
+        Status = LsarpCreateAccount(PolicyObject,
+                                    AccountSid,
+                                    0,
+                                    &AccountObject);
+        if (!NT_SUCCESS(Status))
+        {
+            WARN("LsarpCreateAccount returned 0x%08lx\n", Status);
+            goto done;
+        }
+    }
+
+    if (ulNewPrivileges > 0)
+    {
+        Size = 0;
+
+        /* Get the size of the Privilgs attribute */
+        Status = LsapGetObjectAttribute(AccountObject,
+                                        L"Privilgs",
+                                        NULL,
+                                        &Size);
+        if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+            goto done;
+
+        /* Calculate the required privilege set buffer size */
+        if (Size == 0)
+            PrivilegeSetBufferSize = sizeof(PRIVILEGE_SET) +
+                                     (ulNewPrivileges - 1) * sizeof(LUID_AND_ATTRIBUTES);
+        else
+            PrivilegeSetBufferSize = Size +
+                                     ulNewPrivileges * sizeof(LUID_AND_ATTRIBUTES);
+
+        /* Allocate the privilege set buffer */
+        PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(),
+                                       HEAP_ZERO_MEMORY,
+                                       PrivilegeSetBufferSize);
+        if (PrivilegeSet == NULL)
+            return STATUS_NO_MEMORY;
+
+        /* Get the privilege set */
+        if (Size != 0)
+        {
+            Status = LsapGetObjectAttribute(AccountObject,
+                                            L"Privilgs",
+                                            PrivilegeSet,
+                                            &Size);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN("LsapGetObjectAttribute() failed (Status 0x%08lx)\n", Status);
+                goto done;
+            }
+        }
+
+        PrivilegeCount = PrivilegeSet->PrivilegeCount;
+        TRACE("Privilege count: %lu\n", PrivilegeCount);
+
+        for (i = 0; i < UserRights->Entries; i++)
+        {
+            pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]);
+            if (pLuid == NULL)
+                continue;
+
+            bFound = FALSE;
+            for (j = 0; j < PrivilegeSet->PrivilegeCount; j++)
+            {
+                if (RtlEqualLuid(&(PrivilegeSet->Privilege[j].Luid), pLuid))
+                {
+                    bFound = TRUE;
+                    break;
+                }
+            }
+
+            if (bFound == FALSE)
+            {
+                /* Copy the new privilege */
+                RtlCopyMemory(&(PrivilegeSet->Privilege[PrivilegeSet->PrivilegeCount]),
+                              pLuid,
+                              sizeof(LUID));
+                PrivilegeSet->PrivilegeCount++;
+            }
+        }
+
+        /* Store the extended privilege set */
+        if (PrivilegeCount != PrivilegeSet->PrivilegeCount)
+        {
+            Size = sizeof(PRIVILEGE_SET) +
+                   (PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES);
+
+            Status = LsapSetObjectAttribute(AccountObject,
+                                            L"Privilgs",
+                                            PrivilegeSet,
+                                            Size);
+            if (!NT_SUCCESS(Status))
+            {
+                WARN("LsapSetObjectAttribute() failed (Status 0x%08lx)\n", Status);
+                goto done;
+            }
+        }
+    }
+
+    if (ulNewRights > 0)
+    {
+        Size = sizeof(ACCESS_MASK);
+
+        /* Get the system access flags, if the attribute exists */
+        Status = LsapGetObjectAttribute(AccountObject,
+                                        L"ActSysAc",
+                                        &SystemAccess,
+                                        &Size);
+        if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+            goto done;
+
+        /* Set the new access rights */
+        for (i = 0; i < UserRights->Entries; i++)
+        {
+            Value = LsapLookupAccountRightValue(&UserRights->UserRights[i]);
+            if (Value != 0)
+                SystemAccess |= Value;
+        }
+
+        /* Set the system access flags */
+        Status = LsapSetObjectAttribute(AccountObject,
+                                        L"ActSysAc",
+                                        &SystemAccess,
+                                        sizeof(ACCESS_MASK));
+    }
+
+done:
+    if (PrivilegeSet != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet);
+
+    if (AccountObject != NULL)
+        LsapCloseDbObject(AccountObject);
+
+    return Status;
+}
+
+
+/* Function 38 */
+NTSTATUS WINAPI LsarRemoveAccountRights(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID AccountSid,
+    BOOLEAN AllRights,
+    PLSAPR_USER_RIGHT_SET UserRights)
+{
+    PLSA_DB_OBJECT PolicyObject;
+    PLSA_DB_OBJECT AccountObject = NULL;
+    ULONG PrivilegesToRemove = 0, RightsToRemove = 0;
+    ACCESS_MASK SystemAccess = 0;
+    ULONG Size, Value, i, j, Index;
+    PPRIVILEGE_SET PrivilegeSet = NULL;
+    ULONG PrivilegeCount;
+    PLUID pLuid;
+    NTSTATUS Status;
+
+    TRACE("LsarRemoveAccountRights(%p %p %lu %p)\n",
+          PolicyHandle, AccountSid, AllRights, UserRights);
+
+    /* Validate the AccountSid */
+    if (!RtlValidSid(AccountSid))
+        return STATUS_INVALID_PARAMETER;
+
+    /* Validate the UserRights */
+    if (UserRights == NULL)
+        return STATUS_INVALID_PARAMETER;
+
+    /* Validate the privilege and account right names */
+    for (i = 0; i < UserRights->Entries; i++)
+    {
+        if (LsarpLookupPrivilegeValue(&UserRights->UserRights[i]) != NULL)
+        {
+            PrivilegesToRemove++;
+        }
+        else
+        {
+            if (LsapLookupAccountRightValue(&UserRights->UserRights[i]) == 0)
+                return STATUS_NO_SUCH_PRIVILEGE;
+
+            RightsToRemove++;
+        }
+    }
+
+    /* Validate the PolicyHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_LOOKUP_NAMES,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    /* Open the account */
+    Status = LsarpOpenAccount(PolicyObject,
+                              AccountSid,
+                              0,
+                              &AccountObject);
+    if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+    {
+        ERR("LsarpOpenAccount returned 0x%08lx\n", Status);
+        goto done;
+    }
+
+    if (AllRights == FALSE)
+    {
+        /* Get the size of the Privilgs attribute */
+        Size = 0;
+        Status = LsapGetObjectAttribute(AccountObject,
+                                        L"Privilgs",
+                                        NULL,
+                                        &Size);
+        if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+            goto done;
+
+        if ((Size != 0) && (PrivilegesToRemove != 0))
+        {
+            /* Allocate the privilege set buffer */
+            PrivilegeSet = RtlAllocateHeap(RtlGetProcessHeap(),
+                                           HEAP_ZERO_MEMORY,
+                                           Size);
+            if (PrivilegeSet == NULL)
+                return STATUS_NO_MEMORY;
+
+            /* Get the privilege set */
+            Status = LsapGetObjectAttribute(AccountObject,
+                                            L"Privilgs",
+                                            PrivilegeSet,
+                                            &Size);
+            if (!NT_SUCCESS(Status))
+            {
+                ERR("LsapGetObjectAttribute() failed (Status 0x%08lx)\n", Status);
+                goto done;
+            }
+
+            PrivilegeCount = PrivilegeSet->PrivilegeCount;
+
+            for (i = 0; i < UserRights->Entries; i++)
+            {
+                pLuid = LsarpLookupPrivilegeValue(&UserRights->UserRights[i]);
+                if (pLuid == NULL)
+                    continue;
+
+                Index = -1;
+                for (j = 0; j < PrivilegeSet->PrivilegeCount; j++)
+                {
+                    if (RtlEqualLuid(&(PrivilegeSet->Privilege[j].Luid), pLuid))
+                    {
+                        Index = j;
+                        break;
+                    }
+                }
+
+                if (Index != -1)
+                {
+                    /* Remove the privilege */
+                    if ((PrivilegeSet->PrivilegeCount > 1) &&
+                        (Index < PrivilegeSet->PrivilegeCount - 1))
+                        RtlMoveMemory(&(PrivilegeSet->Privilege[Index]),
+                                      &(PrivilegeSet->Privilege[Index + 1]),
+                                      (Index - PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID));
+
+                    /* Wipe the last entry */
+                    RtlZeroMemory(&(PrivilegeSet->Privilege[PrivilegeSet->PrivilegeCount - 1]),
+                                  sizeof(LUID));
+
+                    PrivilegeSet->PrivilegeCount--;
+                }
+            }
+
+            /* Store the extended privilege set */
+            if (PrivilegeCount != PrivilegeSet->PrivilegeCount)
+            {
+                Size = sizeof(PRIVILEGE_SET) +
+                       (PrivilegeSet->PrivilegeCount - 1) * sizeof(LUID_AND_ATTRIBUTES);
+
+                Status = LsapSetObjectAttribute(AccountObject,
+                                                L"Privilgs",
+                                                PrivilegeSet,
+                                                Size);
+                if (!NT_SUCCESS(Status))
+                {
+                    ERR("LsapSetObjectAttribute() failed (Status 0x%08lx)\n", Status);
+                    goto done;
+                }
+            }
+        }
+
+        /* Get the system access flags, if the attribute exists */
+        Size = 0;
+        Status = LsapGetObjectAttribute(AccountObject,
+                                        L"ActSysAc",
+                                        &SystemAccess,
+                                        &Size);
+        if (!NT_SUCCESS(Status) && Status != STATUS_OBJECT_NAME_NOT_FOUND)
+            goto done;
+
+        if ((Size != 0) && (RightsToRemove != 0))
+        {
+            ERR("Rights: 0x%lx\n", SystemAccess);
+
+            /* Set the new access rights */
+            for (i = 0; i < UserRights->Entries; i++)
+            {
+                Value = LsapLookupAccountRightValue(&UserRights->UserRights[i]);
+                if (Value != 0)
+                    SystemAccess &= ~Value;
+            }
+            ERR("New Rights: 0x%lx\n", SystemAccess);
+
+            /* Set the system access flags */
+            Status = LsapSetObjectAttribute(AccountObject,
+                                            L"ActSysAc",
+                                            &SystemAccess,
+                                            sizeof(ACCESS_MASK));
+        }
+    }
+    else
+    {
+    }
+
+done:
+    if (PrivilegeSet != NULL)
+        RtlFreeHeap(RtlGetProcessHeap(), 0, PrivilegeSet);
+
+    if (AccountObject != NULL)
+        LsapCloseDbObject(AccountObject);
+
+    return Status;
+}
+
+
+/* Function 39 */
+NTSTATUS WINAPI LsarQueryTrustedDomainInfo(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID TrustedDomainSid,
+    TRUSTED_INFORMATION_CLASS InformationClass,
+    PLSAPR_TRUSTED_DOMAIN_INFO *TrustedDomainInformation)
+{
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
+}
+
+
+/* Function 40 */
+NTSTATUS WINAPI LsarSetTrustedDomainInfo(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID TrustedDomainSid,
+    TRUSTED_INFORMATION_CLASS InformationClass,
+    PLSAPR_TRUSTED_DOMAIN_INFO TrustedDomainInformation)
+{
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
+}
+
+
+/* Function 41 */
+NTSTATUS WINAPI LsarDeleteTrustedDomain(
+    LSAPR_HANDLE PolicyHandle,
+    PRPC_SID TrustedDomainSid)
+{
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
+}
 
 
 /* Function 42 */
@@ -2364,8 +3356,151 @@ NTSTATUS WINAPI LsarStorePrivateData(
     PRPC_UNICODE_STRING KeyName,
     PLSAPR_CR_CIPHER_VALUE EncryptedData)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    PLSA_DB_OBJECT PolicyObject = NULL;
+    PLSA_DB_OBJECT SecretsObject = NULL;
+    PLSA_DB_OBJECT SecretObject = NULL;
+    LARGE_INTEGER Time;
+    PBYTE Value = NULL;
+    ULONG ValueLength = 0;
+    NTSTATUS Status;
+
+    TRACE("LsarStorePrivateData(%p %p %p)\n",
+          PolicyHandle, KeyName, EncryptedData);
+
+    /* Validate the SecretHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_CREATE_SECRET,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    /* Open the 'Secrets' object */
+    Status = LsapOpenDbObject(PolicyObject,
+                              NULL,
+                              L"Secrets",
+                              LsaDbIgnoreObject,
+                              0,
+                              PolicyObject->Trusted,
+                              &SecretsObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    if (EncryptedData == NULL)
+    {
+        /* Open the Secret object */
+        Status = LsapOpenDbObject(SecretsObject,
+                                  NULL,
+                                  KeyName->Buffer,
+                                  LsaDbSecretObject,
+                                  0,
+                                  PolicyObject->Trusted,
+                                  &SecretObject);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Delete the secret */
+        Status = LsapDeleteDbObject(SecretObject);
+        if (NT_SUCCESS(Status))
+            SecretObject = NULL;
+    }
+    else
+    {
+        /* Create the Secret object */
+        Status = LsapCreateDbObject(SecretsObject,
+                                    NULL,
+                                    KeyName->Buffer,
+                                    LsaDbSecretObject,
+                                    0,
+                                    PolicyObject->Trusted,
+                                    &SecretObject);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapCreateDbObject failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* FIXME: Decrypt data */
+        Value = EncryptedData->Buffer;
+        ValueLength = EncryptedData->MaximumLength;
+
+        /* Get the current time */
+        Status = NtQuerySystemTime(&Time);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Set the current value */
+        Status = LsapSetObjectAttribute(SecretObject,
+                                        L"CurrentValue",
+                                        Value,
+                                        ValueLength);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Set the current time */
+        Status = LsapSetObjectAttribute(SecretObject,
+                                        L"CurrentTime",
+                                        &Time,
+                                        sizeof(LARGE_INTEGER));
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Get the current time */
+        Status = NtQuerySystemTime(&Time);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("NtQuerySystemTime failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Set the old value */
+        Status = LsapSetObjectAttribute(SecretObject,
+                                        L"OldValue",
+                                        NULL,
+                                        0);
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status);
+            goto done;
+        }
+
+        /* Set the old time */
+        Status = LsapSetObjectAttribute(SecretObject,
+                                        L"OldTime",
+                                        &Time,
+                                        sizeof(LARGE_INTEGER));
+        if (!NT_SUCCESS(Status))
+        {
+            ERR("LsapSetObjectAttribute failed (Status 0x%08lx)\n", Status);
+        }
+    }
+
+done:
+    if (SecretObject != NULL)
+        LsapCloseDbObject(SecretObject);
+
+    if (SecretsObject != NULL)
+        LsapCloseDbObject(SecretsObject);
+
+    return Status;
 }
 
 
@@ -2375,8 +3510,100 @@ NTSTATUS WINAPI LsarRetrievePrivateData(
     PRPC_UNICODE_STRING KeyName,
     PLSAPR_CR_CIPHER_VALUE *EncryptedData)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    PLSA_DB_OBJECT PolicyObject = NULL;
+    PLSA_DB_OBJECT SecretObject = NULL;
+    PLSAPR_CR_CIPHER_VALUE EncCurrentValue = NULL;
+    ULONG CurrentValueLength = 0;
+    PBYTE CurrentValue = NULL;
+    NTSTATUS Status;
+
+    TRACE("LsarRetrievePrivateData(%p %wZ %p)\n",
+          PolicyHandle, KeyName, EncryptedData);
+
+    /* Validate the SecretHandle */
+    Status = LsapValidateDbObject(PolicyHandle,
+                                  LsaDbPolicyObject,
+                                  POLICY_CREATE_SECRET,
+                                  &PolicyObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapValidateDbObject returned 0x%08lx\n", Status);
+        return Status;
+    }
+
+    /* Open the secret object */
+    Status = LsapOpenDbObject(PolicyObject,
+                              L"Secrets",
+                              KeyName->Buffer,
+                              LsaDbSecretObject,
+                              0,
+                              PolicyObject->Trusted,
+                              &SecretObject);
+    if (!NT_SUCCESS(Status))
+    {
+        ERR("LsapOpenDbObject failed (Status 0x%08lx)\n", Status);
+        goto done;
+    }
+
+    /* Get the size of the current value */
+    Status = LsapGetObjectAttribute(SecretObject,
+                                    L"CurrentValue",
+                                    NULL,
+                                    &CurrentValueLength);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    /* Allocate a buffer for the current value */
+    CurrentValue = midl_user_allocate(CurrentValueLength);
+    if (CurrentValue == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    /* Get the current value */
+    Status = LsapGetObjectAttribute(SecretObject,
+                                    L"CurrentValue",
+                                    CurrentValue,
+                                    &CurrentValueLength);
+    if (!NT_SUCCESS(Status))
+        goto done;
+
+    /* Allocate a buffer for the encrypted current value */
+    EncCurrentValue = midl_user_allocate(sizeof(LSAPR_CR_CIPHER_VALUE) + CurrentValueLength);
+    if (EncCurrentValue == NULL)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto done;
+    }
+
+    /* FIXME: Encrypt the current value */
+    EncCurrentValue->Length = (USHORT)(CurrentValueLength - sizeof(WCHAR));
+    EncCurrentValue->MaximumLength = (USHORT)CurrentValueLength;
+    EncCurrentValue->Buffer = (PBYTE)(EncCurrentValue + 1);
+    RtlCopyMemory(EncCurrentValue->Buffer,
+                  CurrentValue,
+                  CurrentValueLength);
+
+done:
+    if (NT_SUCCESS(Status))
+    {
+        if (EncryptedData != NULL)
+            *EncryptedData = EncCurrentValue;
+    }
+    else
+    {
+        if (EncryptedData != NULL)
+            *EncryptedData = NULL;
+
+        if (EncCurrentValue != NULL)
+            midl_user_free(EncCurrentValue);
+    }
+
+    if (SecretObject != NULL)
+        LsapCloseDbObject(SecretObject);
+
+    return Status;
 }
 
 
@@ -2436,8 +3663,8 @@ NTSTATUS WINAPI LsarQueryTrustedDomainInfoByName(
     POLICY_INFORMATION_CLASS InformationClass,
     PLSAPR_TRUSTED_DOMAIN_INFO *PolicyInformation)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_OBJECT_NAME_NOT_FOUND;
 }
 
 
@@ -2448,8 +3675,8 @@ NTSTATUS WINAPI LsarSetTrustedDomainInfoByName(
     POLICY_INFORMATION_CLASS InformationClass,
     PLSAPR_TRUSTED_DOMAIN_INFO PolicyInformation)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_OBJECT_NAME_NOT_FOUND;
 }
 
 
@@ -2460,8 +3687,10 @@ NTSTATUS WINAPI LsarEnumerateTrustedDomainsEx(
     PLSAPR_TRUSTED_ENUM_BUFFER_EX EnumerationBuffer,
     DWORD PreferedMaximumLength)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    EnumerationBuffer->EntriesRead = 0;
+    EnumerationBuffer->EnumerationBuffer = NULL;
+    return STATUS_NO_MORE_ENTRIES;
 }
 
 
@@ -2473,8 +3702,8 @@ NTSTATUS WINAPI LsarCreateTrustedDomainEx(
     ACCESS_MASK DesiredAccess,
     LSAPR_HANDLE *TrustedDomainHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
 }
 
 
@@ -2516,8 +3745,8 @@ NTSTATUS WINAPI LsarOpenTrustedDomainByName(
     ACCESS_MASK DesiredAccess,
     LSAPR_HANDLE *TrustedDomainHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_OBJECT_NAME_NOT_FOUND;
 }
 
 
@@ -2543,7 +3772,7 @@ NTSTATUS WINAPI LsarLookupSids2(
 {
     NTSTATUS Status;
 
-    TRACE("(%p %p %p %p %d %p %lu %lu)\n",
+    TRACE("LsarLookupSids2(%p %p %p %p %d %p %lu %lu)\n",
           PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames,
           LookupLevel, MappedCount, LookupOptions, ClientRevision);
 
@@ -2581,7 +3810,7 @@ NTSTATUS WINAPI LsarLookupNames2(
     ULONG i;
     NTSTATUS Status;
 
-    TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n",
+    TRACE("LsarLookupNames2(%p %lu %p %p %p %d %p %lu %lu)\n",
           PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids,
           LookupLevel, MappedCount, LookupOptions, ClientRevision);
 
@@ -2638,14 +3867,14 @@ NTSTATUS WINAPI LsarCreateTrustedDomainEx2(
     ACCESS_MASK DesiredAccess,
     LSAPR_HANDLE *TrustedDomainHandle)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    /* FIXME: We are not running an AD yet */
+    return STATUS_DIRECTORY_SERVICE_REQUIRED;
 }
 
 
 /* Function 60 */
 NTSTATUS WINAPI CredrWrite(
-    handle_t hBinding)
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2654,7 +3883,7 @@ NTSTATUS WINAPI CredrWrite(
 
 /* Function 61 */
 NTSTATUS WINAPI CredrRead(
-    handle_t hBinding)
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2663,7 +3892,7 @@ NTSTATUS WINAPI CredrRead(
 
 /* Function 62 */
 NTSTATUS WINAPI CredrEnumerate(
-    handle_t hBinding)
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2672,7 +3901,7 @@ NTSTATUS WINAPI CredrEnumerate(
 
 /* Function 63 */
 NTSTATUS WINAPI CredrWriteDomainCredentials(
-    handle_t hBinding)
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2681,7 +3910,7 @@ NTSTATUS WINAPI CredrWriteDomainCredentials(
 
 /* Function 64 */
 NTSTATUS WINAPI CredrReadDomainCredentials(
-    handle_t hBinding)
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2689,8 +3918,13 @@ NTSTATUS WINAPI CredrReadDomainCredentials(
 
 
 /* Function 65 */
-NTSTATUS WINAPI CredrDelete(
-    handle_t hBinding)
+NTSTATUS
+WINAPI
+CredrDelete(
+    PLSAPR_SERVER_NAME SystemName,
+    LPWSTR TargetName,
+    DWORD Type,
+    DWORD Flags)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2698,8 +3932,13 @@ NTSTATUS WINAPI CredrDelete(
 
 
 /* Function 66 */
-NTSTATUS WINAPI CredrGetTargetInfo(
-    handle_t hBinding)
+NTSTATUS
+WINAPI
+CredrGetTargetInfo(
+    PLSAPR_SERVER_NAME SystemName,
+    LPWSTR TargetName,
+    DWORD Flags,
+    CREDPR_TARGET_INFORMATION *TargetInformation)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2707,8 +3946,10 @@ NTSTATUS WINAPI CredrGetTargetInfo(
 
 
 /* Function 67 */
-NTSTATUS WINAPI CredrProfileLoaded(
-    handle_t hBinding)
+NTSTATUS
+WINAPI
+CredrProfileLoaded(
+    PLSAPR_SERVER_NAME SystemName)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2729,7 +3970,7 @@ NTSTATUS WINAPI LsarLookupNames3(
 {
     NTSTATUS Status;
 
-    TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n",
+    TRACE("LsarLookupNames3(%p %lu %p %p %p %d %p %lu %lu)\n",
           PolicyHandle, Count, Names, ReferencedDomains, TranslatedSids,
           LookupLevel, MappedCount, LookupOptions, ClientRevision);
 
@@ -2754,8 +3995,12 @@ NTSTATUS WINAPI LsarLookupNames3(
 
 
 /* Function 69 */
-NTSTATUS WINAPI CredrGetSessionTypes(
-    handle_t hBinding)
+NTSTATUS
+WINAPI
+CredrGetSessionTypes(
+    PLSAPR_SERVER_NAME SystemName,
+    DWORD MaximumPersistCount,
+    DWORD *MaximumPersist)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2807,7 +4052,7 @@ NTSTATUS WINAPI LsarSetForestTrustInformation(
     PLSA_UNICODE_STRING TrustedDomainName,
     LSA_FOREST_TRUST_RECORD_TYPE HighestRecordType,
     PLSA_FOREST_TRUST_INFORMATION ForestTrustInfo,
-    BOOL CheckOnly,
+    BOOLEAN CheckOnly,
     PLSA_FOREST_TRUST_COLLISION_INFORMATION *CollisionInfo)
 {
     UNIMPLEMENTED;
@@ -2816,8 +4061,14 @@ NTSTATUS WINAPI LsarSetForestTrustInformation(
 
 
 /* Function 75 */
-NTSTATUS WINAPI CredrRename(
-    handle_t hBinding)
+NTSTATUS
+WINAPI
+CredrRename(
+    PLSAPR_SERVER_NAME SystemName,
+    LPWSTR OldTargetName,
+    LPWSTR NewTargetName,
+    DWORD Type,
+    DWORD Flags)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;
@@ -2837,7 +4088,7 @@ NTSTATUS WINAPI LsarLookupSids3(
 {
     NTSTATUS Status;
 
-    TRACE("(%p %p %p %p %d %p %lu %lu)\n",
+    TRACE("LsarLookupSids3(%p %p %p %p %d %p %lu %lu)\n",
           PolicyHandle, SidEnumBuffer, ReferencedDomains, TranslatedNames,
           LookupLevel, MappedCount, LookupOptions, ClientRevision);
 
@@ -2873,7 +4124,7 @@ NTSTATUS WINAPI LsarLookupNames4(
 {
     NTSTATUS Status;
 
-    TRACE("(%p %lu %p %p %p %d %p %lu %lu)\n",
+    TRACE("LsarLookupNames4(%p %lu %p %p %p %d %p %lu %lu)\n",
           RpcHandle, Count, Names, ReferencedDomains, TranslatedSids,
           LookupLevel, MappedCount, LookupOptions, ClientRevision);
 
@@ -2899,7 +4150,10 @@ NTSTATUS WINAPI LsarLookupNames4(
 
 /* Function 78 */
 NTSTATUS WINAPI LsarOpenPolicySce(
-    handle_t hBinding)
+    LPWSTR SystemName,
+    PLSAPR_OBJECT_ATTRIBUTES ObjectAttributes,
+    ACCESS_MASK DesiredAccess,
+    LSAPR_HANDLE *PolicyHandle)
 {
     UNIMPLEMENTED;
     return STATUS_NOT_IMPLEMENTED;