https://git.reactos.org/?p=reactos.git;a=commitdiff;h=228dab60da7559ce607424517ecfd1d097db0a3c
commit 228dab60da7559ce607424517ecfd1d097db0a3c Author: Eric Kohl <[email protected]> AuthorDate: Thu Jul 15 17:25:06 2021 +0200 Commit: Eric Kohl <[email protected]> CommitDate: Thu Jul 15 17:25:06 2021 +0200 [SAMSRV] SamrQueryInformationDomain: Older functions should call new functions --- dll/win32/samsrv/samrpc.c | 232 +++++++++++++++++++++++----------------------- 1 file changed, 116 insertions(+), 116 deletions(-) diff --git a/dll/win32/samsrv/samrpc.c b/dll/win32/samsrv/samrpc.c index d67c84b7312..5c8bdff6f78 100644 --- a/dll/win32/samsrv/samrpc.c +++ b/dll/win32/samsrv/samrpc.c @@ -1616,122 +1616,12 @@ SamrQueryInformationDomain(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { - PSAM_DB_OBJECT DomainObject; - ACCESS_MASK DesiredAccess; - NTSTATUS Status; - TRACE("SamrQueryInformationDomain(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); - switch (DomainInformationClass) - { - case DomainPasswordInformation: - case DomainLockoutInformation: - DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; - break; - - case DomainGeneralInformation: - case DomainLogoffInformation: - case DomainOemInformation: - case DomainNameInformation: - case DomainReplicationInformation: - case DomainServerRoleInformation: - case DomainModifiedInformation: - case DomainStateInformation: - case DomainModifiedInformation2: - DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; - break; - - case DomainGeneralInformation2: - DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS | - DOMAIN_READ_OTHER_PARAMETERS; - break; - - default: - return STATUS_INVALID_INFO_CLASS; - } - - RtlAcquireResourceShared(&SampResource, - TRUE); - - /* Validate the server handle */ - Status = SampValidateDbObject(DomainHandle, - SamDbDomainObject, - DesiredAccess, - &DomainObject); - if (!NT_SUCCESS(Status)) - goto done; - - switch (DomainInformationClass) - { - case DomainPasswordInformation: - Status = SampQueryDomainPassword(DomainObject, - Buffer); - break; - - case DomainGeneralInformation: - Status = SampQueryDomainGeneral(DomainObject, - Buffer); - break; - - case DomainLogoffInformation: - Status = SampQueryDomainLogoff(DomainObject, - Buffer); - break; - - case DomainOemInformation: - Status = SampQueryDomainOem(DomainObject, - Buffer); - break; - - case DomainNameInformation: - Status = SampQueryDomainName(DomainObject, - Buffer); - break; - - case DomainReplicationInformation: - Status = SampQueryDomainReplication(DomainObject, - Buffer); - break; - - case DomainServerRoleInformation: - Status = SampQueryDomainServerRole(DomainObject, - Buffer); - break; - - case DomainModifiedInformation: - Status = SampQueryDomainModified(DomainObject, - Buffer); - break; - - case DomainStateInformation: - Status = SampQueryDomainState(DomainObject, - Buffer); - break; - - case DomainGeneralInformation2: - Status = SampQueryDomainGeneral2(DomainObject, - Buffer); - break; - - case DomainLockoutInformation: - Status = SampQueryDomainLockout(DomainObject, - Buffer); - break; - - case DomainModifiedInformation2: - Status = SampQueryDomainModified2(DomainObject, - Buffer); - break; - - default: - Status = STATUS_NOT_IMPLEMENTED; - } - -done: - RtlReleaseResource(&SampResource); - - return Status; + return SamrQueryInformationDomain2(DomainHandle, + DomainInformationClass, + Buffer); } @@ -8572,12 +8462,122 @@ SamrQueryInformationDomain2(IN SAMPR_HANDLE DomainHandle, IN DOMAIN_INFORMATION_CLASS DomainInformationClass, OUT PSAMPR_DOMAIN_INFO_BUFFER *Buffer) { + PSAM_DB_OBJECT DomainObject; + ACCESS_MASK DesiredAccess; + NTSTATUS Status; + TRACE("SamrQueryInformationDomain2(%p %lu %p)\n", DomainHandle, DomainInformationClass, Buffer); - return SamrQueryInformationDomain(DomainHandle, - DomainInformationClass, - Buffer); + switch (DomainInformationClass) + { + case DomainPasswordInformation: + case DomainLockoutInformation: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS; + break; + + case DomainGeneralInformation: + case DomainLogoffInformation: + case DomainOemInformation: + case DomainNameInformation: + case DomainReplicationInformation: + case DomainServerRoleInformation: + case DomainModifiedInformation: + case DomainStateInformation: + case DomainModifiedInformation2: + DesiredAccess = DOMAIN_READ_OTHER_PARAMETERS; + break; + + case DomainGeneralInformation2: + DesiredAccess = DOMAIN_READ_PASSWORD_PARAMETERS | + DOMAIN_READ_OTHER_PARAMETERS; + break; + + default: + return STATUS_INVALID_INFO_CLASS; + } + + RtlAcquireResourceShared(&SampResource, + TRUE); + + /* Validate the server handle */ + Status = SampValidateDbObject(DomainHandle, + SamDbDomainObject, + DesiredAccess, + &DomainObject); + if (!NT_SUCCESS(Status)) + goto done; + + switch (DomainInformationClass) + { + case DomainPasswordInformation: + Status = SampQueryDomainPassword(DomainObject, + Buffer); + break; + + case DomainGeneralInformation: + Status = SampQueryDomainGeneral(DomainObject, + Buffer); + break; + + case DomainLogoffInformation: + Status = SampQueryDomainLogoff(DomainObject, + Buffer); + break; + + case DomainOemInformation: + Status = SampQueryDomainOem(DomainObject, + Buffer); + break; + + case DomainNameInformation: + Status = SampQueryDomainName(DomainObject, + Buffer); + break; + + case DomainReplicationInformation: + Status = SampQueryDomainReplication(DomainObject, + Buffer); + break; + + case DomainServerRoleInformation: + Status = SampQueryDomainServerRole(DomainObject, + Buffer); + break; + + case DomainModifiedInformation: + Status = SampQueryDomainModified(DomainObject, + Buffer); + break; + + case DomainStateInformation: + Status = SampQueryDomainState(DomainObject, + Buffer); + break; + + case DomainGeneralInformation2: + Status = SampQueryDomainGeneral2(DomainObject, + Buffer); + break; + + case DomainLockoutInformation: + Status = SampQueryDomainLockout(DomainObject, + Buffer); + break; + + case DomainModifiedInformation2: + Status = SampQueryDomainModified2(DomainObject, + Buffer); + break; + + default: + Status = STATUS_NOT_IMPLEMENTED; + } + +done: + RtlReleaseResource(&SampResource); + + return Status; }
