From b04a5e09f7b50e5b9c589e43c5df91f4913e3ab0 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Mon, 4 Feb 2008 22:53:03 +0100
Subject: Use pidl for _samr_GetUserPwInfo().

Guenther
(This used to be commit 4e7236c10e5a1cbea2e961e196729603c66f37d6)
---
 source3/rpc_server/srv_samr.c    | 23 +----------------------
 source3/rpc_server/srv_samr_nt.c | 27 ++++++++-------------------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 15cbf4cb61..211b9cd661 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -80,28 +80,7 @@ static bool api_samr_open_domain(pipes_struct *p)
 
 static bool api_samr_get_usrdom_pwinfo(pipes_struct *p)
 {
-	SAMR_Q_GET_USRDOM_PWINFO q_u;
-	SAMR_R_GET_USRDOM_PWINFO r_u;
-
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	if(!samr_io_q_get_usrdom_pwinfo("", &q_u, data, 0)) {
-		DEBUG(0,("api_samr_get_usrdom_pwinfo: unable to unmarshall SAMR_Q_GET_USRDOM_PWINFO.\n"));
-		return False;
-	}
-
-	r_u.status = _samr_get_usrdom_pwinfo(p, &q_u, &r_u);
-
-	if(!samr_io_r_get_usrdom_pwinfo("", &r_u, rdata, 0)) {
-		DEBUG(0,("api_samr_get_usrdom_pwinfo: unable to marshall SAMR_R_GET_USRDOM_PWINFO.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_samr_call(p, NDR_SAMR_GETUSERPWINFO);
 }
 
 /*******************************************************************
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 95c31ebc8b..bb83bda3da 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -618,32 +618,31 @@ NTSTATUS _samr_OpenDomain(pipes_struct *p,
 }
 
 /*******************************************************************
- _samr_get_usrdom_pwinfo
+ _samr_GetUserPwInfo
  ********************************************************************/
 
-NTSTATUS _samr_get_usrdom_pwinfo(pipes_struct *p, SAMR_Q_GET_USRDOM_PWINFO *q_u, SAMR_R_GET_USRDOM_PWINFO *r_u)
+NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
+			     struct samr_GetUserPwInfo *r)
 {
 	struct samr_info *info = NULL;
 
-	r_u->status = NT_STATUS_OK;
-
 	/* find the policy handle.  open a policy on it. */
-	if (!find_policy_by_hnd(p, &q_u->user_pol, (void **)(void *)&info))
+	if (!find_policy_by_hnd(p, r->in.user_handle, (void **)(void *)&info))
 		return NT_STATUS_INVALID_HANDLE;
 
 	if (!sid_check_is_in_our_domain(&info->sid))
 		return NT_STATUS_OBJECT_TYPE_MISMATCH;
 
-	init_samr_r_get_usrdom_pwinfo(r_u, NT_STATUS_OK);
+	ZERO_STRUCTP(r->out.info);
 
-	DEBUG(5,("_samr_get_usrdom_pwinfo: %d\n", __LINE__));
+	DEBUG(5,("_samr_GetUserPwInfo: %d\n", __LINE__));
 
-	/* 
+	/*
 	 * NT sometimes return NT_STATUS_ACCESS_DENIED
 	 * I don't know yet why.
 	 */
 
-	return r_u->status;
+	return NT_STATUS_OK;
 }
 
 /*******************************************************************
@@ -5357,16 +5356,6 @@ NTSTATUS _samr_TestPrivateFunctionsUser(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_GetUserPwInfo(pipes_struct *p,
-			     struct samr_GetUserPwInfo *r)
-{
-	p->rng_fault_state = true;
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_RemoveMemberFromForeignDomain(pipes_struct *p,
 					     struct samr_RemoveMemberFromForeignDomain *r)
 {
-- 
cgit