Use pidl for _samr_SetAliasInfo().

Guenther
(This used to be commit f483797c688ee1a5c5f7e183cdf7c1b700b7db31)

2 files changed, 22 insertions, 58 deletions

diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index a547f0acd1..a38e9461c4 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -744,28 +744,7 @@ static bool api_samr_set_groupinfo(pipes_struct *p)
 
 static bool api_samr_set_aliasinfo(pipes_struct *p)
 {
-	SAMR_Q_SET_ALIASINFO q_u;
-	SAMR_R_SET_ALIASINFO 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_set_aliasinfo("", &q_u, data, 0)) {
-		DEBUG(0,("api_samr_set_aliasinfo: unable to unmarshall SAMR_Q_SET_ALIASINFO.\n"));
-		return False;
-	}
-
-	r_u.status = _samr_set_aliasinfo(p, &q_u, &r_u);
-
-	if (!samr_io_r_set_aliasinfo("", &r_u, rdata, 0)) {
-		DEBUG(0,("api_samr_set_aliasinfo: unable to marshall SAMR_R_SET_ALIASINFO.\n"));
-		return False;
-	}
-
-	return True;
+	return proxy_samr_call(p, NDR_SAMR_SETALIASINFO);
 }
 
 /*******************************************************************
diff --git a/source3/rpc_server/srv_samr_nt.c b/source3/rpc_server/srv_samr_nt.c
index bb957c632f..a06977eed7 100644
--- a/source3/rpc_server/srv_samr_nt.c
+++ b/source3/rpc_server/srv_samr_nt.c
@@ -4784,30 +4784,29 @@ NTSTATUS _samr_set_groupinfo(pipes_struct *p, SAMR_Q_SET_GROUPINFO *q_u, SAMR_R_
 }
 
 /*********************************************************************
- _samr_set_aliasinfo
-
- update an alias's comment.
+ _samr_SetAliasInfo
 *********************************************************************/
 
-NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_SET_ALIASINFO *r_u)
+NTSTATUS _samr_SetAliasInfo(pipes_struct *p,
+			    struct samr_SetAliasInfo *r)
 {
 	DOM_SID group_sid;
 	struct acct_info info;
-	ALIAS_INFO_CTR *ctr;
 	uint32 acc_granted;
 	bool can_mod_accounts;
 	NTSTATUS status;
 	DISP_INFO *disp_info = NULL;
 
-	if (!get_lsa_policy_samr_sid(p, &q_u->alias_pol, &group_sid, &acc_granted, &disp_info))
+	if (!get_lsa_policy_samr_sid(p, r->in.alias_handle, &group_sid, &acc_granted, &disp_info))
 		return NT_STATUS_INVALID_HANDLE;
 
-	if (!NT_STATUS_IS_OK(r_u->status = access_check_samr_function(acc_granted, SA_RIGHT_ALIAS_SET_INFO, "_samr_set_aliasinfo"))) {
-		return r_u->status;
+	status = access_check_samr_function(acc_granted,
+					    SA_RIGHT_ALIAS_SET_INFO,
+					    "_samr_SetAliasInfo");
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
-	ctr=&q_u->ctr;
-
 	/* get the current group information */
 
 	become_root();
@@ -4817,10 +4816,10 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
 	if ( !NT_STATUS_IS_OK(status))
 		return status;
 
-	switch (ctr->level) {
-		case 2:
+	switch (r->in.level) {
+		case ALIASINFONAME:
 		{
-			fstring group_name, acct_name;
+			fstring group_name;
 
 			/* We currently do not support renaming groups in the
 			   the BUILTIN domain.  Refer to util_builtin.c to understand
@@ -4833,19 +4832,16 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
 
 			/* There has to be a valid name (and it has to be different) */
 
-			if ( !ctr->alias.info2.name.string )
+			if ( !r->in.info->name.string )
 				return NT_STATUS_INVALID_PARAMETER;
 
-			unistr2_to_ascii( acct_name, ctr->alias.info2.name.string,
-				sizeof(acct_name));
-
 			/* If the name is the same just reply "ok".  Yes this
 			   doesn't allow you to change the case of a group name. */
 
-			if ( strequal( acct_name, info.acct_name ) )
+			if ( strequal( r->in.info->name.string, info.acct_name ) )
 				return NT_STATUS_OK;
 
-			fstrcpy( info.acct_name, acct_name );
+			fstrcpy( info.acct_name, r->in.info->name.string);
 
 			/* make sure the name doesn't already exist as a user
 			   or local group */
@@ -4856,14 +4852,13 @@ NTSTATUS _samr_set_aliasinfo(pipes_struct *p, SAMR_Q_SET_ALIASINFO *q_u, SAMR_R_
 				return status;
 			break;
 		}
-		case 3:
-			if ( ctr->alias.info3.description.string ) {
-				unistr2_to_ascii( info.acct_desc,
-					ctr->alias.info3.description.string,
-					sizeof(info.acct_desc));
-			}
-			else
+		case ALIASINFODESCRIPTION:
+			if (r->in.info->description.string) {
+				fstrcpy(info.acct_desc,
+					r->in.info->description.string);
+			} else {
 				fstrcpy( info.acct_desc, "" );
+			}
 			break;
 		default:
 			return NT_STATUS_INVALID_INFO_CLASS;
@@ -5244,16 +5239,6 @@ NTSTATUS _samr_QueryAliasInfo(pipes_struct *p,
 /****************************************************************
 ****************************************************************/
 
-NTSTATUS _samr_SetAliasInfo(pipes_struct *p,
-			    struct samr_SetAliasInfo *r)
-{
-	p->rng_fault_state = true;
-	return NT_STATUS_NOT_IMPLEMENTED;
-}
-
-/****************************************************************
-****************************************************************/
-
 NTSTATUS _samr_QueryUserInfo(pipes_struct *p,
 			     struct samr_QueryUserInfo *r)
 {