Use rpccli_samr_OpenDomain() all over the place.

Guenther
(This used to be commit e4e9d72724d547e1405b2ed4cec509d50ec88c8d)

diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index c34afc7caecd8d6a11ae4f449ef43de70064d663..cea5ea6d46535f44ceb2ba2622989ac6d2a69534 100644 (file)
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -671,10 +671,11 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                        r->out.domain_sid,
-                                        &domain_pol);
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       r->out.domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }
@@ -840,10 +841,11 @@ static NTSTATUS libnet_join_unjoindomain_rpc(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                        r->in.domain_sid,
-                                        &domain_pol);
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       r->in.domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(status)) {
                goto done;
        }

diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
index 04406b04db93810b976665be449e5f0d924894a9..53337e6ca4d325119eb2e495c61caf7fa324acd2 100644 (file)
--- a/source3/rpcclient/cmd_samr.c
+++ b/source3/rpcclient/cmd_samr.c
@@ -374,10 +374,11 @@ static NTSTATUS cmd_samr_query_user(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
-
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
@@ -567,9 +568,11 @@ static NTSTATUS cmd_samr_query_group(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -632,9 +635,10 @@ static NTSTATUS cmd_samr_query_usergroups(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid, &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -723,14 +727,16 @@ static NTSTATUS cmd_samr_query_useraliases(struct rpc_pipe_client *cli,
                goto done;
 
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             access_mask,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               access_mask,
+                                               &domain_sid, &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             access_mask,
-                                             &global_sid_Builtin,
-                                             &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               access_mask,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else {
                printf("Usage: %s builtin|domain sid1 sid2 ...\n", argv[0]);
                return NT_STATUS_INVALID_PARAMETER;
@@ -789,9 +795,11 @@ static NTSTATUS cmd_samr_query_groupmem(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -865,9 +873,11 @@ static NTSTATUS cmd_samr_enum_dom_users(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -937,9 +947,11 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1011,13 +1023,17 @@ static NTSTATUS cmd_samr_enum_als_groups(struct rpc_pipe_client *cli,
        /* Get domain policy handle */
 
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             access_mask,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               access_mask,
+                                               &domain_sid,
+                                               &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             access_mask,
-                                             &global_sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               access_mask,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else
                return NT_STATUS_OK;
 
@@ -1089,13 +1105,17 @@ static NTSTATUS cmd_samr_query_aliasmem(struct rpc_pipe_client *cli,
        /* Open handle on domain */
        
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &domain_sid,
+                                               &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &global_sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else
                return NT_STATUS_OK;
 
@@ -1159,13 +1179,17 @@ static NTSTATUS cmd_samr_delete_alias(struct rpc_pipe_client *cli,
        /* Open handle on domain */
        
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &domain_sid,
+                                               &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &global_sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else
                return NT_STATUS_INVALID_PARAMETER;
 
@@ -1261,9 +1285,11 @@ static NTSTATUS cmd_samr_query_dispinfo(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask, 
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1376,9 +1402,11 @@ static NTSTATUS cmd_samr_query_dominfo(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1474,9 +1502,11 @@ static NTSTATUS cmd_samr_create_dom_user(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1541,9 +1571,11 @@ static NTSTATUS cmd_samr_create_dom_group(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1601,9 +1633,11 @@ static NTSTATUS cmd_samr_create_dom_alias(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                        access_mask,
-                                        &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1658,13 +1692,17 @@ static NTSTATUS cmd_samr_lookup_names(struct rpc_pipe_client *cli,
                goto done;
 
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &domain_sid,
+                                               &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &global_sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else
                return NT_STATUS_OK;
 
@@ -1730,13 +1768,17 @@ static NTSTATUS cmd_samr_lookup_rids(struct rpc_pipe_client *cli,
                goto done;
 
        if (StrCaseCmp(argv[1], "domain")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &domain_sid,
+                                               &domain_pol);
        else if (StrCaseCmp(argv[1], "builtin")==0)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &global_sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                               &domain_pol);
        else
                return NT_STATUS_OK;
 
@@ -1801,9 +1843,11 @@ static NTSTATUS cmd_samr_delete_dom_group(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1874,9 +1918,11 @@ static NTSTATUS cmd_samr_delete_dom_user(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -1966,9 +2012,11 @@ static NTSTATUS cmd_samr_query_sec_obj(struct rpc_pipe_client *cli,
                goto done;
 
        if (domain || user_rid)
-               result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &domain_sid, &domain_pol);
+               result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &domain_sid,
+                                               &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2032,8 +2080,11 @@ static NTSTATUS cmd_samr_get_usrdom_pwinfo(struct rpc_pipe_client *cli,
                goto done;
        }
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                        MAXIMUM_ALLOWED_ACCESS, &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -2117,8 +2168,11 @@ static NTSTATUS cmd_samr_lookup_domain(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask, &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2168,9 +2222,11 @@ static NTSTATUS cmd_samr_chgpasswd2(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;
@@ -2224,9 +2280,11 @@ static NTSTATUS cmd_samr_chgpasswd3(struct rpc_pipe_client *cli,
 
        /* Get domain policy handle */
 
-       result = rpccli_samr_open_domain(cli, mem_ctx, &connect_pol,
-                                     access_mask,
-                                     &domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(cli, mem_ctx,
+                                       &connect_pol,
+                                       access_mask,
+                                       &domain_sid,
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                goto done;

diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index b15f61bf637f598af47930993ea757fe349a9856..15764e47f6b71e764eab95cbf7e4be6dde8aff8c 100644 (file)
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -71,9 +71,12 @@ NTSTATUS netdom_leave_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
-       
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, dom_sid, &domain_pol);
+
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       dom_sid,
+                                       &domain_pol);
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
@@ -232,9 +235,12 @@ NTSTATUS netdom_join_domain( TALLOC_CTX *mem_ctx, struct cli_state *cli,
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
-       
-       status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                       SEC_RIGHTS_MAXIMUM_ALLOWED, dom_sid, &domain_pol);
+
+       status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &sam_pol,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       dom_sid,
+                                       &domain_pol);
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index bfd181c5370968d86b7a8a4c1007f40cb81bf690..4826c4bedc9e00e09aae05625bb0cbc121975c59 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -452,11 +452,13 @@ NTSTATUS rpc_info_internals(const DOM_SID *domain_sid,
                d_fprintf(stderr, "Could not connect to SAM: %s\n", nt_errstr(result));
                goto done;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                d_fprintf(stderr, "Could not open domain: %s\n", nt_errstr(result));
                goto done;
@@ -607,10 +609,12 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid,
        }
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -757,9 +761,11 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid,
                goto done;
        }
 
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -867,10 +873,12 @@ static NTSTATUS rpc_user_rename_internals(const DOM_SID *domain_sid,
        }
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1016,9 +1024,11 @@ static NTSTATUS rpc_user_password_internals(const DOM_SID *domain_sid,
                goto done;
        }
 
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
@@ -1134,10 +1144,12 @@ static NTSTATUS rpc_user_info_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
        /* Get handle on user */
@@ -1241,10 +1253,12 @@ static NTSTATUS rpc_user_list_internals(const DOM_SID *domain_sid,
        }
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1385,9 +1399,11 @@ static NTSTATUS rpc_sh_handle_user(TALLOC_CTX *mem_ctx,
                goto done;
        }
 
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                        MAXIMUM_ALLOWED_ACCESS,
-                                        ctx->domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       ctx->domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -1749,11 +1765,13 @@ static NTSTATUS rpc_group_delete_internals(const DOM_SID *domain_sid,
                d_fprintf(stderr, "Request samr_connect failed\n");
                goto done;
         }
-        
-        result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                      MAXIMUM_ALLOWED_ACCESS,
-                                      domain_sid, &domain_pol);
-        
+
+        result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
+
         if (!NT_STATUS_IS_OK(result)) {
                d_fprintf(stderr, "Request open_domain failed\n");
                goto done;
@@ -1923,10 +1941,12 @@ static NTSTATUS rpc_group_add_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
        /* Create the group */
@@ -1980,10 +2000,12 @@ static NTSTATUS rpc_alias_add_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(result)) goto done;
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) goto done;
 
        /* Create the group */
@@ -2106,11 +2128,13 @@ static NTSTATUS rpc_add_groupmem(struct rpc_pipe_client *pipe_hnd,
        if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                return result;
        }
@@ -2174,11 +2198,13 @@ static NTSTATUS rpc_add_aliasmem(struct rpc_pipe_client *pipe_hnd,
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2285,11 +2311,13 @@ static NTSTATUS rpc_del_groupmem(struct rpc_pipe_client *pipe_hnd,
                                  &connect_pol);
        if (!NT_STATUS_IS_OK(result))
                return result;
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result))
                return result;
 
@@ -2350,11 +2378,13 @@ static NTSTATUS rpc_del_aliasmem(struct rpc_pipe_client *pipe_hnd,
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       &sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2491,10 +2521,12 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
        }
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2593,10 +2625,12 @@ static NTSTATUS rpc_group_list_internals(const DOM_SID *domain_sid,
        } while (NT_STATUS_EQUAL(result, STATUS_MORE_ENTRIES));
        rpccli_samr_Close(pipe_hnd, mem_ctx, &domain_pol);
        /* Get builtin policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     &global_sid_Builtin, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, &global_sid_Builtin),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -2825,10 +2859,12 @@ static NTSTATUS rpc_group_members_internals(const DOM_SID *domain_sid,
                return result;
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -2846,9 +2882,11 @@ static NTSTATUS rpc_group_members_internals(const DOM_SID *domain_sid,
 
                string_to_sid(&sid_Builtin, "S-1-5-32");                
 
-               result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                             MAXIMUM_ALLOWED_ACCESS,
-                                             &sid_Builtin, &domain_pol);
+               result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                               &connect_pol,
+                                               MAXIMUM_ALLOWED_ACCESS,
+                                               &sid_Builtin,
+                                               &domain_pol);
 
                if (!NT_STATUS_IS_OK(result)) {
                        d_fprintf(stderr, "Couldn't find group %s\n", argv[0]);
@@ -2922,10 +2960,12 @@ static NTSTATUS rpc_group_rename_internals(const DOM_SID *domain_sid,
                return result;
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
 
        if (!NT_STATUS_IS_OK(result))
                return result;
@@ -4013,10 +4053,12 @@ static NTSTATUS rpc_fetch_domain_aliases(struct rpc_pipe_client *pipe_hnd,
        POLICY_HND domain_pol;
 
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result))
                return result;
 
@@ -5373,11 +5415,13 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -5520,11 +5564,13 @@ static NTSTATUS rpc_trustdom_del_internals(const DOM_SID *domain_sid,
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
-       
+
        /* Get domain policy handle */
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                     MAXIMUM_ALLOWED_ACCESS,
-                                     domain_sid, &domain_pol);
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       CONST_DISCARD(struct dom_sid2 *, domain_sid),
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }
@@ -6210,12 +6256,14 @@ static int rpc_trustdom_list(int argc, const char **argv)
                talloc_destroy(mem_ctx);
                return -1;
        };
-       
+
        /* SamrOpenDomain - we have to open domain policy handle in order to be
           able to enumerate accounts*/
-       nt_status = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_hnd,
-                                        SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
-                                        queried_dom_sid, &domain_hnd);                                                                  
+       nt_status = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                          &connect_hnd,
+                                          SA_RIGHT_DOMAIN_ENUM_ACCOUNTS,
+                                          queried_dom_sid,
+                                          &domain_hnd);
        if (!NT_STATUS_IS_OK(nt_status)) {
                DEBUG(0, ("Couldn't open domain object. Error was %s\n",
                        nt_errstr(nt_status)));

diff --git a/source3/utils/net_rpc_join.c b/source3/utils/net_rpc_join.c
index de8661b0df18d300368cbc0531f6097a8a42db06..41ee4f2c365ce8cee2d43e7b1a7782c55ee450c4 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -236,10 +236,12 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                                       &sam_pol),
                      "could not connect to SAM database");
 
-       
-       CHECK_RPC_ERR(rpccli_samr_open_domain(pipe_hnd, mem_ctx, &sam_pol,
-                                          SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                          domain_sid, &domain_pol),
+
+       CHECK_RPC_ERR(rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                            &sam_pol,
+                                            SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                            domain_sid,
+                                            &domain_pol),
                      "could not open domain");
 
        /* Create domain user */

diff --git a/source3/utils/net_rpc_sh_acct.c b/source3/utils/net_rpc_sh_acct.c
index f5b0c2e0d7b1b294d2ea0f0f8f6230d6e18a29a5..12da031d4b36d5113204a696f84a1ba2355cb59e 100644 (file)
--- a/source3/utils/net_rpc_sh_acct.c
+++ b/source3/utils/net_rpc_sh_acct.c
@@ -54,10 +54,12 @@ static NTSTATUS rpc_sh_acct_do(TALLOC_CTX *mem_ctx,
        }
        
        /* Get domain policy handle */
-       
-       result = rpccli_samr_open_domain(pipe_hnd, mem_ctx, &connect_pol,
-                                        MAXIMUM_ALLOWED_ACCESS,
-                                        ctx->domain_sid, &domain_pol);
+
+       result = rpccli_samr_OpenDomain(pipe_hnd, mem_ctx,
+                                       &connect_pol,
+                                       MAXIMUM_ALLOWED_ACCESS,
+                                       ctx->domain_sid,
+                                       &domain_pol);
        if (!NT_STATUS_IS_OK(result)) {
                goto done;
        }

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 66787a0d6ddb87aa0bab329849629109c5f52df3..d2a76630024dcca051a147275e81508f17af2c79 100644 (file)
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2176,12 +2176,12 @@ NTSTATUS cm_connect_sam(struct winbindd_domain *domain, TALLOC_CTX *mem_ctx,
        }
 
  open_domain:
-       result = rpccli_samr_open_domain(conn->samr_pipe,
-                                        mem_ctx,
-                                        &conn->sam_connect_handle,
-                                        SEC_RIGHTS_MAXIMUM_ALLOWED,
-                                        &domain->sid,
-                                        &conn->sam_domain_handle);
+       result = rpccli_samr_OpenDomain(conn->samr_pipe,
+                                       mem_ctx,
+                                       &conn->sam_connect_handle,
+                                       SEC_RIGHTS_MAXIMUM_ALLOWED,
+                                       &domain->sid,
+                                       &conn->sam_domain_handle);
 
  done: