[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-947-g99ae115

[Günther Deschner]

The branch, v3-4-test has been updated
       via  99ae1159fe885cf57ec5cd964febca2eca5def61 (commit)
      from  a26ac9ce2708e8d959500da418daefcb3ca94bd6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 99ae1159fe885cf57ec5cd964febca2eca5def61
Author: Günther Deschner <gd at samba.org>
Date:   Tue May 12 01:16:52 2009 +0200

    s3-samr: Fix rid2sid call, 3-4-test does not have policy_handle_find() yet.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/rpc_server/srv_samr_nt.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 0c86073..4fb315d 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -6572,18 +6572,14 @@ NTSTATUS _samr_GetDisplayEnumerationIndex2(pipes_struct *p,
 NTSTATUS _samr_RidToSid(pipes_struct *p,
 			struct samr_RidToSid *r)
 {
-	struct samr_domain_info *dinfo;
-	NTSTATUS status;
+	struct samr_info *info = NULL;
 	struct dom_sid sid;
 
-	dinfo = policy_handle_find(p, r->in.domain_handle,
-				   0, NULL,
-				   struct samr_domain_info, &status);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
+	if (!find_policy_by_hnd(p, r->in.domain_handle, (void **)(void *)&info)) {
+		return NT_STATUS_INVALID_HANDLE;
 	}
 
-	if (!sid_compose(&sid, &dinfo->sid, r->in.rid)) {
+	if (!sid_compose(&sid, &info->sid, r->in.rid)) {
 		return NT_STATUS_NO_MEMORY;
 	}
 


-- 
Samba Shared Repository