2 files changed, 19 insertions, 50 deletions

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 73a1228b68..dd162c7479 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -519,29 +519,7 @@ static bool api_samr_chgpasswd_user3(pipes_struct *p)
 
 static bool api_samr_connect5(pipes_struct *p)
 {
-	SAMR_Q_CONNECT5 q_u;
-	SAMR_R_CONNECT5 r_u;
-	prs_struct *data = &p->in_data.data;
-	prs_struct *rdata = &p->out_data.rdata;
-
-	ZERO_STRUCT(q_u);
-	ZERO_STRUCT(r_u);
-
-	/* grab the samr open policy */
-	if(!samr_io_q_connect5("", &q_u, data, 0)) {
-		DEBUG(0,("api_samr_connect5: unable to unmarshall SAMR_Q_CONNECT5.\n"));
-		return False;
-	}
-
-	r_u.status = _samr_connect5(p, &q_u, &r_u);
-
-	/* store the response in the SMB stream */
-	if(!samr_io_r_connect5("", &r_u, rdata, 0)) {
-		DEBUG(0,("api_samr_connect5: unable to marshall SAMR_R_CONNECT5.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_samr_call(p, NDR_SAMR_CONNECT5);
 }
 
 /**********************************************************************
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index 3531001a58..4e0487f7ff 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -2793,37 +2793,34 @@ NTSTATUS _samr_Connect4(pipes_struct *p,
 }
 
 /*******************************************************************
- samr_connect5
+ _samr_Connect5
  ********************************************************************/
 
-NTSTATUS _samr_connect5(pipes_struct *p, SAMR_Q_CONNECT5 *q_u, SAMR_R_CONNECT5 *r_u)
+NTSTATUS _samr_Connect5(pipes_struct *p,
+			struct samr_Connect5 *r)
 {
 	struct samr_info *info = NULL;
 	SEC_DESC *psd = NULL;
 	uint32    acc_granted;
-	uint32    des_access = q_u->access_mask;
+	uint32    des_access = r->in.access_mask;
 	NTSTATUS  nt_status;
-	POLICY_HND pol;
 	size_t    sd_size;
+	struct samr_ConnectInfo1 info1;
 
-
-	DEBUG(5,("_samr_connect5: %d\n", __LINE__));
-
-	ZERO_STRUCTP(r_u);
+	DEBUG(5,("_samr_Connect5: %d\n", __LINE__));
 
 	/* Access check */
 
 	if (!pipe_access_check(p)) {
-		DEBUG(3, ("access denied to samr_connect5\n"));
-		r_u->status = NT_STATUS_ACCESS_DENIED;
-		return r_u->status;
+		DEBUG(3, ("access denied to samr_Connect5\n"));
+		return NT_STATUS_ACCESS_DENIED;
 	}
 
 	make_samr_object_sd(p->mem_ctx, &psd, &sd_size, &sam_generic_mapping, NULL, 0);
 	se_map_generic(&des_access, &sam_generic_mapping);
 	
 	nt_status = access_check_samr_object(psd, p->pipe_user.nt_user_token, 
-		NULL, 0, des_access, &acc_granted, "_samr_connect5");
+		NULL, 0, des_access, &acc_granted, "_samr_Connect5");
 	
 	if ( !NT_STATUS_IS_OK(nt_status) ) 
 		return nt_status;
@@ -2833,17 +2830,21 @@ NTSTATUS _samr_connect5(pipes_struct *p, SAMR_Q_CONNECT5 *q_u, SAMR_R_CONNECT5 *
 		return NT_STATUS_NO_MEMORY;
 
 	info->acc_granted = acc_granted;
-	info->status = q_u->access_mask;
+	info->status = r->in.access_mask; /* ??? */
 
 	/* get a (unique) handle.  open a policy on it. */
-	if (!create_policy_hnd(p, &pol, free_samr_info, (void *)info))
+	if (!create_policy_hnd(p, r->out.connect_handle, free_samr_info, (void *)info))
 		return NT_STATUS_OBJECT_NAME_NOT_FOUND;
 
-	DEBUG(5,("_samr_connect: %d\n", __LINE__));
+	DEBUG(5,("_samr_Connect5: %d\n", __LINE__));
 
-	init_samr_r_connect5(r_u, &pol, NT_STATUS_OK);
+	info1.unknown1 = 3;
+	info1.unknown2 = 0;
 
-	return r_u->status;
+	*r->out.level_out = 1;
+	r->out.info_out->info1 = info1;
+
+	return NT_STATUS_OK;
 }
 
 /**********************************************************************
@@ -5519,16 +5520,6 @@ NTSTATUS _samr_ChangePasswordUser3(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_Connect5(pipes_struct *p,
-			struct samr_Connect5 *r)
-{
-	p->rng_fault_state = true;
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_RidToSid(pipes_struct *p,
 			struct samr_RidToSid *r)
 {