s3:dom_sid Global replace of DOM_SID with struct dom_sid

[ira/wip.git] / source3 / rpcclient / cmd_samr.c

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 7f4b50615ecc1cd5d8b58379e3f74022e1e2d30f..199c8b1dccdcd35cf446c4f7f6d788a4df70b207 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -27,8 +27,9 @@
 #include "../libcli/auth/libcli_auth.h"
 #include "../librpc/gen_ndr/cli_samr.h"
 #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
@@ -629,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;
@@ -645,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;
@@ -2338,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]);