summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2010-05-21 11:25:01 +1000
committerGünther Deschner <gd@samba.org>2010-05-21 10:39:59 +0200
commitcba7f8b8273e661d3c43652900d93e5a8eab4e5f (patch)
tree714e00240ddc0c7e689240d2c8fb7d9196b1fff2 /source3/rpcclient
parenta92b653af964364ee438c6ee69a87eb7603ceab0 (diff)
downloadsamba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.gz
samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.tar.bz2
samba-cba7f8b8273e661d3c43652900d93e5a8eab4e5f.zip
s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to, and removes one more of the old-style named structures, and the need to know that is is just an alias for struct dom_sid. Andrew Bartlett Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/rpcclient')
-rw-r--r--source3/rpcclient/cmd_lsarpc.c30
-rw-r--r--source3/rpcclient/cmd_samr.c8
-rw-r--r--source3/rpcclient/rpcclient.c2
3 files changed, 20 insertions, 20 deletions
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 6ddcc55b20..da01e6ec94 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -30,12 +30,12 @@
* looking it up automatically */
static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
- DOM_SID *sid, const char *name)
+ struct dom_sid *sid, const char *name)
{
struct policy_handle pol;
enum lsa_SidType *sid_types;
NTSTATUS result;
- DOM_SID *sids;
+ struct dom_sid *sids;
/* maybe its a raw SID */
if (strncmp(name, "S-", 2) == 0 &&
@@ -212,7 +212,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
{
struct policy_handle pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID *sids;
+ struct dom_sid *sids;
enum lsa_SidType *types;
int i;
@@ -260,7 +260,7 @@ static NTSTATUS cmd_lsa_lookup_names_level(struct rpc_pipe_client *cli,
{
struct policy_handle pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID *sids;
+ struct dom_sid *sids;
enum lsa_SidType *types;
int i, level;
@@ -361,7 +361,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
{
struct policy_handle pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID *sids;
+ struct dom_sid *sids;
char **domains;
char **names;
enum lsa_SidType *types;
@@ -381,7 +381,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
/* Convert arguments to sids */
- sids = TALLOC_ARRAY(mem_ctx, DOM_SID, argc - 1);
+ sids = TALLOC_ARRAY(mem_ctx, struct dom_sid, argc - 1);
if (!sids) {
printf("could not allocate memory for %d sids\n", argc - 1);
@@ -732,7 +732,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint32 des_access = 0x000f000f;
- DOM_SID sid;
+ struct dom_sid sid;
if (argc != 2 ) {
printf("Usage: %s SID\n", argv[0]);
@@ -778,7 +778,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
struct policy_handle user_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint32 access_desired = 0x000f000f;
- DOM_SID sid;
+ struct dom_sid sid;
struct lsa_PrivilegeSet *privs = NULL;
int i;
@@ -839,7 +839,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
{
struct policy_handle dom_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID sid;
+ struct dom_sid sid;
struct lsa_RightSet rights;
int i;
@@ -890,7 +890,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
struct policy_handle dom_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct lsa_RightSet rights;
- DOM_SID sid;
+ struct dom_sid sid;
int i;
if (argc < 3 ) {
@@ -943,7 +943,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
struct policy_handle dom_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct lsa_RightSet rights;
- DOM_SID sid;
+ struct dom_sid sid;
int i;
if (argc < 3 ) {
@@ -1120,7 +1120,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
{
struct policy_handle pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID dom_sid;
+ struct dom_sid dom_sid;
uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
union lsa_TrustedDomainInfo *info = NULL;
enum lsa_TrustDomInfoEnum info_class = 1;
@@ -1219,7 +1219,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
uint32 access_mask = SEC_FLAG_MAXIMUM_ALLOWED;
union lsa_TrustedDomainInfo *info = NULL;
- DOM_SID dom_sid;
+ struct dom_sid dom_sid;
enum lsa_TrustDomInfoEnum info_class = 1;
uint8_t nt_hash[16];
@@ -1320,7 +1320,7 @@ static NTSTATUS cmd_lsa_add_priv(struct rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct lsa_PrivilegeSet privs;
struct lsa_LUIDAttribute *set = NULL;
- DOM_SID sid;
+ struct dom_sid sid;
int i;
ZERO_STRUCT(privs);
@@ -1404,7 +1404,7 @@ static NTSTATUS cmd_lsa_del_priv(struct rpc_pipe_client *cli,
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
struct lsa_PrivilegeSet privs;
struct lsa_LUIDAttribute *set = NULL;
- DOM_SID sid;
+ struct dom_sid sid;
int i;
ZERO_STRUCT(privs);
diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 7cd2f9af88..199c8b1dcc 100644
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -29,7 +29,7 @@
#include "rpc_client/cli_samr.h"
#include "rpc_client/init_samr.h"
-extern DOM_SID domain_sid;
+extern struct dom_sid domain_sid;
/****************************************************************************
display samr_user_info_7 structure
@@ -630,7 +630,7 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
{
struct policy_handle connect_pol, domain_pol;
NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
- DOM_SID *sids;
+ struct dom_sid *sids;
size_t num_sids;
uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
int i;
@@ -646,7 +646,7 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
num_sids = 0;
for (i=2; i<argc; i++) {
- DOM_SID tmp_sid;
+ struct dom_sid tmp_sid;
if (!string_to_sid(&tmp_sid, argv[i])) {
printf("%s is not a legal SID\n", argv[i]);
return NT_STATUS_INVALID_PARAMETER;
@@ -2339,7 +2339,7 @@ static NTSTATUS cmd_samr_lookup_domain(struct rpc_pipe_client *cli,
uint32 access_mask = MAXIMUM_ALLOWED_ACCESS;
fstring sid_string;
struct lsa_String domain_name;
- DOM_SID *sid = NULL;
+ struct dom_sid *sid = NULL;
if (argc != 2) {
printf("Usage: %s domain_name\n", argv[0]);
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 19693920dc..56c0057dd9 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -27,7 +27,7 @@
#include "../librpc/gen_ndr/ndr_netlogon.h"
#include "rpc_client/cli_netlogon.h"
-DOM_SID domain_sid;
+struct dom_sid domain_sid;
static enum pipe_auth_type pipe_default_auth_type = PIPE_AUTH_TYPE_NONE;
static enum dcerpc_AuthLevel pipe_default_auth_level = DCERPC_AUTH_LEVEL_NONE;