The branch, v3-2-test has been updated
via 20503717be5287c003ca63d74419f785d59f83e0 (commit)
via 882537f26f44103a4882c388844c5b24d4903e9c (commit)
via 8cc094ddb5c28c7378be6c655f3311ea6abb4f64 (commit)
from 31d5a3aaa42c18319fd751aba65f435348b1e83e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 20503717be5287c003ca63d74419f785d59f83e0
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Feb 1 01:43:46 2008 +0100
Remove unused marshalling for SAMR_DELETE_DOM_GROUP.
Guenther
commit 882537f26f44103a4882c388844c5b24d4903e9c
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Feb 1 01:19:06 2008 +0100
Remove rpccli_samr_delete_dom_group().
Guenther
commit 8cc094ddb5c28c7378be6c655f3311ea6abb4f64
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Fri Feb 1 01:17:22 2008 +0100
Use rpccli_samr_DeleteDomainGroup() in net and rpcclient.
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/include/rpc_samr.h | 17 ------------
source/rpc_client/cli_samr.c | 33 -----------------------
source/rpc_parse/parse_samr.c | 59 -----------------------------------------
source/rpcclient/cmd_samr.c | 5 ++-
source/utils/net_rpc.c | 3 +-
5 files changed, 5 insertions(+), 112 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/include/rpc_samr.h b/source/include/rpc_samr.h
index 1f6cb95..a3588f7 100644
--- a/source/include/rpc_samr.h
+++ b/source/include/rpc_samr.h
@@ -1059,23 +1059,6 @@ typedef struct r_samr_get_dispenum_index
} SAMR_R_GET_DISPENUM_INDEX;
-/* SAMR_Q_DELETE_DOM_GROUP - delete domain group */
-typedef struct q_samr_delete_dom_group_info
-{
- POLICY_HND group_pol; /* policy handle */
-
-} SAMR_Q_DELETE_DOM_GROUP;
-
-
-/* SAMR_R_DELETE_DOM_GROUP - delete domain group */
-typedef struct r_samr_delete_dom_group_info
-{
- POLICY_HND pol; /* policy handle */
- NTSTATUS status; /* return status */
-
-} SAMR_R_DELETE_DOM_GROUP;
-
-
/* SAMR_Q_CREATE_DOM_GROUP - SAM create group */
typedef struct q_samr_create_dom_group_info
{
diff --git a/source/rpc_client/cli_samr.c b/source/rpc_client/cli_samr.c
index 2fb3768..974d966 100644
--- a/source/rpc_client/cli_samr.c
+++ b/source/rpc_client/cli_samr.c
@@ -1740,39 +1740,6 @@ NTSTATUS rpccli_samr_set_userinfo2(struct
rpc_pipe_client *cli, TALLOC_CTX *mem_
return result;
}
-/* Delete domain group */
-
-NTSTATUS rpccli_samr_delete_dom_group(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
- POLICY_HND *group_pol)
-{
- prs_struct qbuf, rbuf;
- SAMR_Q_DELETE_DOM_GROUP q;
- SAMR_R_DELETE_DOM_GROUP r;
- NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
- DEBUG(10,("cli_samr_delete_dom_group\n"));
-
- ZERO_STRUCT(q);
- ZERO_STRUCT(r);
-
- /* Marshall data and send request */
-
- init_samr_q_delete_dom_group(&q, group_pol);
-
- CLI_DO_RPC(cli, mem_ctx, PI_SAMR, SAMR_DELETE_DOM_GROUP,
- q, r,
- qbuf, rbuf,
- samr_io_q_delete_dom_group,
- samr_io_r_delete_dom_group,
- NT_STATUS_UNSUCCESSFUL);
-
- /* Return output parameters */
-
- result = r.status;
-
- return result;
-}
-
/* Delete domain alias */
NTSTATUS rpccli_samr_delete_dom_alias(struct rpc_pipe_client *cli, TALLOC_CTX
*mem_ctx,
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 37f9ba0..21e6102 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -2541,65 +2541,6 @@ bool samr_io_r_create_dom_group(const char *desc,
SAMR_R_CREATE_DOM_GROUP * r_u,
}
/*******************************************************************
-inits a SAMR_Q_DELETE_DOM_GROUP structure.
-********************************************************************/
-
-void init_samr_q_delete_dom_group(SAMR_Q_DELETE_DOM_GROUP * q_c,
- POLICY_HND *hnd)
-{
- DEBUG(5, ("init_samr_q_delete_dom_group\n"));
-
- q_c->group_pol = *hnd;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_q_delete_dom_group(const char *desc, SAMR_Q_DELETE_DOM_GROUP *
q_u,
- prs_struct *ps, int depth)
-{
- if (q_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "samr_io_q_delete_dom_group");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd("group_pol", &q_u->group_pol, ps, depth))
- return False;
-
- return True;
-}
-
-/*******************************************************************
-reads or writes a structure.
-********************************************************************/
-
-bool samr_io_r_delete_dom_group(const char *desc, SAMR_R_DELETE_DOM_GROUP *
r_u,
- prs_struct *ps, int depth)
-{
- if (r_u == NULL)
- return False;
-
- prs_debug(ps, depth, desc, "samr_io_r_delete_dom_group");
- depth++;
-
- if(!prs_align(ps))
- return False;
-
- if(!smb_io_pol_hnd("pol", &r_u->pol, ps, depth))
- return False;
-
- if(!prs_ntstatus("status", ps, depth, &r_u->status))
- return False;
-
- return True;
-}
-
-/*******************************************************************
inits a SAMR_Q_DEL_GROUPMEM structure.
********************************************************************/
diff --git a/source/rpcclient/cmd_samr.c b/source/rpcclient/cmd_samr.c
index 11d9c98..b6d2bb4 100644
--- a/source/rpcclient/cmd_samr.c
+++ b/source/rpcclient/cmd_samr.c
@@ -1829,9 +1829,10 @@ static NTSTATUS cmd_samr_delete_dom_group(struct
rpc_pipe_client *cli,
goto done;
}
- /* Delete user */
+ /* Delete group */
- result = rpccli_samr_delete_dom_group(cli, mem_ctx, &group_pol);
+ result = rpccli_samr_DeleteDomainGroup(cli, mem_ctx,
+ &group_pol);
if (!NT_STATUS_IS_OK(result))
goto done;
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 2140829..78124c8 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1851,7 +1851,8 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID
*domain_sid,
}
}
- result = rpccli_samr_delete_dom_group(pipe_hnd, mem_ctx,
&group_pol);
+ result = rpccli_samr_DeleteDomainGroup(pipe_hnd, mem_ctx,
+ &group_pol);
break;
/* removing a local group is easier... */
--
Samba Shared Repository
