r18747: replace rpccli_lsa_close() with rpccli_lsa_Close()

(This used to be commit 50d74ce0488a9bd0980cdc6d523a210f6238ef74)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 0044c1d13dbb3a4a7b1e2d06aa26231c795196e7..b20ce908aa69b7faf1230da9dbb5887ac932db53 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -320,7 +320,7 @@ RPC_SAMR_OBJ = rpc_server/srv_samr.o rpc_server/srv_samr_nt.o \
 RPC_UNIXINFO_OBJ = librpc/gen_ndr/srv_unixinfo.o rpc_server/srv_unixinfo_nt.o 
 REGFIO_OBJ = registry/regfio.o
 
-RPC_REG_OBJ =  rpc_server/srv_reg.o rpc_server/srv_reg_nt.o $(REGFIO_OBJ)
+RPC_REG_OBJ =  librpc/gen_ndr/srv_winreg.o rpc_server/srv_winreg_nt.o $(REGFIO_OBJ)
 
 RPC_LSA_DS_OBJ =  rpc_server/srv_lsa_ds.o rpc_server/srv_lsa_ds_nt.o
 

diff --git a/source3/libmsrpc/cac_lsarpc.c b/source3/libmsrpc/cac_lsarpc.c
index 60c66e9aff9674409f4b27e77fb5503733cf66b0..3af0b7b3b58d6896148921aef5cd5f070a114ed4 100644 (file)
--- a/source3/libmsrpc/cac_lsarpc.c
+++ b/source3/libmsrpc/cac_lsarpc.c
@@ -124,7 +124,7 @@ int cac_LsaClosePolicy(CacServerHandle *hnd, TALLOC_CTX *mem_ctx, POLICY_HND *po
       return CAC_FAILURE;
    }
 
-   hnd->status = rpccli_lsa_close(pipe_hnd, mem_ctx, pol);
+   hnd->status = rpccli_lsa_Close(pipe_hnd, mem_ctx, pol);
 
    TALLOC_FREE(pol);
 

diff --git a/source3/python/py_lsa.c b/source3/python/py_lsa.c
index 068190c02021c61212b36439e0399fd4dbc46da7..39abc60e25e9f212819d2626e17faa6db1db49a8 100644 (file)
--- a/source3/python/py_lsa.c
+++ b/source3/python/py_lsa.c
@@ -125,7 +125,7 @@ static PyObject *lsa_close(PyObject *self, PyObject *args, PyObject *kw)
 
        /* Call rpc function */
 
-       result = rpccli_lsa_close(hnd->cli, hnd->mem_ctx, &hnd->pol);
+       result = rpccli_lsa_Close(hnd->cli, hnd->mem_ctx, &hnd->pol);
 
        /* Cleanup samba stuff */
 

diff --git a/source3/rpc_client/cli_lsarpc.c b/source3/rpc_client/cli_lsarpc.c
index 2e0e8e36ad38041684a4fe8bd8dead1c844a120f..7b47afc8131b573be35e378e596b18508db56200 100644 (file)
--- a/source3/rpc_client/cli_lsarpc.c
+++ b/source3/rpc_client/cli_lsarpc.c
@@ -127,14 +127,6 @@ NTSTATUS rpccli_lsa_open_policy2(struct rpc_pipe_client *cli,
        return result;
 }
 
-/** Close a LSA policy handle */
-
-NTSTATUS rpccli_lsa_close(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, 
-                         POLICY_HND *pol)
-{
-       return rpccli_lsa_Close( cli, mem_ctx, pol);
-}
-
 /** Lookup a list of sids */
 
 NTSTATUS rpccli_lsa_lookup_sids(struct rpc_pipe_client *cli,

diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index 7134f5fbf273fa849ba267eaa364616cb2c38e90..e94b4bc7a68cb7594fbff0ee55396258775bcec2 100644 (file)
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -51,7 +51,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
 
        *sid = sids[0];
 
@@ -208,7 +208,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct rpc_pipe_client *cli,
 
        display_lsa_query_info(&dom, mem_ctx);
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
 
  done:
        return result;
@@ -256,7 +256,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct rpc_pipe_client *cli,
                       sid_type_lookup(types[i]), types[i]);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
 
  done:
        return result;
@@ -324,7 +324,7 @@ static NTSTATUS cmd_lsa_lookup_sids(struct rpc_pipe_client *cli, TALLOC_CTX *mem
                       names[i] ? names[i] : "*unknown*", types[i]);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
 
  done:
        return result;
@@ -387,7 +387,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct rpc_pipe_client *cli,
                }
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -441,7 +441,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct rpc_pipe_client *cli,
                       privs_high[i], privs_low[i], privs_high[i], privs_low[i]);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -480,7 +480,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct rpc_pipe_client *cli,
        /* Print results */
        printf("%s -> %s (language: 0x%x)\n", argv[1], description, lang_id_desc);
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -534,7 +534,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct rpc_pipe_client *cli,
                printf("%s\n", sid_str);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -576,7 +576,7 @@ static NTSTATUS cmd_lsa_create_account(struct rpc_pipe_client *cli,
        printf("Account for SID %s successfully created\n\n", argv[1]);
        result = NT_STATUS_OK;
 
-       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -632,7 +632,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct rpc_pipe_client *cli,
                printf("%u\t%u\t%u\n", set[i].luid.high, set[i].luid.low, set[i].attr);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -680,7 +680,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct rpc_pipe_client *cli,
                printf("\t%s\n", rights[i]);
        }
 
-       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -719,7 +719,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
  done:
        return result;
 }
@@ -758,7 +758,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct rpc_pipe_client *cli,
        if (!NT_STATUS_IS_OK(result))
                goto done;
 
-       rpccli_lsa_close(cli, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(cli, mem_ctx, &dom_pol);
 
  done:
        return result;
@@ -796,7 +796,7 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct rpc_pipe_client *cli,
 
        printf("%u:%u (0x%x:0x%x)\n", luid.high, luid.low, luid.high, luid.low);
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -836,7 +836,7 @@ static NTSTATUS cmd_lsa_query_secobj(struct rpc_pipe_client *cli,
 
        display_sec_desc(sdb->sd);
 
-       rpccli_lsa_close(cli, mem_ctx, &pol);
+       rpccli_lsa_Close(cli, mem_ctx, &pol);
  done:
        return result;
 }
@@ -944,7 +944,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobysid(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_close(cli, mem_ctx, &pol);
+               rpccli_lsa_Close(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -982,7 +982,7 @@ static NTSTATUS cmd_lsa_query_trustdominfobyname(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_close(cli, mem_ctx, &pol);
+               rpccli_lsa_Close(cli, mem_ctx, &pol);
 
        return result;
 }
@@ -1031,7 +1031,7 @@ static NTSTATUS cmd_lsa_query_trustdominfo(struct rpc_pipe_client *cli,
 
  done:
        if (&pol)
-               rpccli_lsa_close(cli, mem_ctx, &pol);
+               rpccli_lsa_Close(cli, mem_ctx, &pol);
 
        return result;
 }

diff --git a/source3/rpcclient/cmd_test.c b/source3/rpcclient/cmd_test.c
index 94545dc74e6e654b84097f473c9f27537a75c996..28c13965d894cd43b2b067885f3a6acb7b143c9c 100644 (file)
--- a/source3/rpcclient/cmd_test.c
+++ b/source3/rpcclient/cmd_test.c
@@ -43,7 +43,7 @@ static NTSTATUS cmd_testme(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
        if (!NT_STATUS_IS_OK(status))
                goto done;
 
-       status = rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+       status = rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
 
        if (!NT_STATUS_IS_OK(status))
                goto done;

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index be8adcfe540cdc7aabf0a70c5c406a4190b1f396..6e9bc818842674f9c5d5fb4ef63a53803194beed 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -168,7 +168,7 @@ static void fetch_machine_sid(struct cli_state *cli)
        got_domain_sid = True;
        sid_copy( &domain_sid, dom_sid );
 
-       rpccli_lsa_close(lsapipe, mem_ctx, &pol);
+       rpccli_lsa_Close(lsapipe, mem_ctx, &pol);
        cli_rpc_pipe_close(lsapipe);
        talloc_destroy(mem_ctx);
 

diff --git a/source3/sam/idmap_rid.c b/source3/sam/idmap_rid.c
index 63167accf39183fc246f49ffb0000d757c6c6717..c1544d4b4fbef42a997c82d4570f847b73d6412c 100644 (file)
--- a/source3/sam/idmap_rid.c
+++ b/source3/sam/idmap_rid.c
@@ -326,7 +326,7 @@ static NTSTATUS rid_idmap_get_domains(uint32 *num_domains, fstring **domain_name
        status = NT_STATUS_OK;
 
 out:
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
        cli_rpc_pipe_close(pipe_hnd);
        talloc_destroy(mem_ctx);
        cli_shutdown(cli);

diff --git a/source3/utils/net_domain.c b/source3/utils/net_domain.c
index a4a52b23842bb4732d42a3be956affd99cc3270c..ab71d35fde07e02bf1d8fa1c6884e14b6f6cd562 100644 (file)
--- a/source3/utils/net_domain.c
+++ b/source3/utils/net_domain.c
@@ -180,7 +180,7 @@ NTSTATUS netdom_get_domain_sid( TALLOC_CTX *mem_ctx, struct cli_state *cli, DOM_
        if ( !NT_STATUS_IS_OK(status) )
                return status;
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
        cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
 
        /* Bail out if domain didn't get set. */

diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index cb426959c351ca86c7d94051594d6b2a241922f9..766dd43faab91db68c3f37b48bf4295a3401fe4b 100644 (file)
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -81,7 +81,7 @@ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx,
                return result;
        }
 
-       rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+       rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
        cli_rpc_pipe_close(lsa_pipe);
 
        return NT_STATUS_OK;
@@ -2036,7 +2036,7 @@ static NTSTATUS get_sid_from_name(struct cli_state *cli,
                *type = types[0];
        }
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
 
  done:
        if (pipe_hnd) {
@@ -4109,7 +4109,7 @@ static NTSTATUS rpc_aliaslist_dump(const DOM_SID *domain_sid,
                DEBUG(1, ("\n"));
        }
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
 
        return NT_STATUS_OK;
 }
@@ -5722,7 +5722,7 @@ static int rpc_trustdom_establish(int argc, const char **argv)
         * Close the pipes and clean up
         */
         
-       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+       nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't close LSA pipe. Error was %s\n",
                        nt_errstr(nt_status)));
@@ -5984,7 +5984,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv)
        } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
 
        /* close this connection before doing next one */
-       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+       nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't properly close lsa policy handle. Error was %s\n",
                        nt_errstr(nt_status)));
@@ -6108,7 +6108,7 @@ static int rpc_trustdom_list(int argc, const char **argv)
        } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES));
 
        /* close this connection before doing next one */
-       nt_status = rpccli_lsa_close(pipe_hnd, mem_ctx, &connect_hnd);
+       nt_status = rpccli_lsa_Close(pipe_hnd, mem_ctx, &connect_hnd);
        if (NT_STATUS_IS_ERR(nt_status)) {
                DEBUG(0, ("Couldn't properly close lsa policy handle. 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 d23bd76751956ff7ce62c8f9d91ab887ea443acc..ba3c61901265deb2d7b83c05856800c8eedf803b 100644 (file)
--- a/source3/utils/net_rpc_join.c
+++ b/source3/utils/net_rpc_join.c
@@ -193,7 +193,7 @@ int net_rpc_join_newstyle(int argc, const char **argv)
                                                5, &domain, &domain_sid),
                      "error querying info policy");
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &lsa_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &lsa_pol);
        cli_rpc_pipe_close(pipe_hnd); /* Done with this pipe */
 
        /* Bail out if domain didn't get set. */

diff --git a/source3/utils/net_rpc_rights.c b/source3/utils/net_rpc_rights.c
index 11c4991e7d76d7b3916d6ab7ad62c1c889875d30..5c999e4cb0ef6e2fea7a65030d33e4645a0e390b 100644 (file)
--- a/source3/utils/net_rpc_rights.c
+++ b/source3/utils/net_rpc_rights.c
@@ -48,7 +48,7 @@ static NTSTATUS sid_to_name(struct rpc_pipe_client *pipe_hnd,
                        fstrcpy( name, names[0] );
        }
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
        return result;
 }
 
@@ -81,7 +81,7 @@ static NTSTATUS name_to_sid(struct rpc_pipe_client *pipe_hnd,
        if ( NT_STATUS_IS_OK(result) )
                sid_copy( sid, &sids[0] );
 
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
        return result;
 }
 
@@ -391,7 +391,7 @@ static NTSTATUS rpc_rights_list_internal(const DOM_SID *domain_sid,
        result = enum_privileges_for_user(pipe_hnd, mem_ctx, &pol, &sid );
 
 done:
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &pol);
 
        return result;
 }
@@ -442,7 +442,7 @@ static NTSTATUS rpc_rights_grant_internal(const DOM_SID *domain_sid,
                        argv[0], nt_errstr(result));
        }
                
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
        
        return result;
 }
@@ -493,7 +493,7 @@ done:
                        argv[0], nt_errstr(result));
        }
        
-       rpccli_lsa_close(pipe_hnd, mem_ctx, &dom_pol);
+       rpccli_lsa_Close(pipe_hnd, mem_ctx, &dom_pol);
 
        return result;
 }      

diff --git a/source3/utils/net_util.c b/source3/utils/net_util.c
index be39a754656e26d383128d293954b29aaf72debd..db6420d6b774629c73184382319ce9824a39acdc 100644 (file)
--- a/source3/utils/net_util.c
+++ b/source3/utils/net_util.c
@@ -81,7 +81,7 @@ NTSTATUS net_rpc_lookup_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
 
  done:
        if (is_valid_policy_hnd(&pol)) {
-               rpccli_lsa_close(lsa_pipe, mem_ctx, &pol);
+               rpccli_lsa_Close(lsa_pipe, mem_ctx, &pol);
        }
        cli_rpc_pipe_close(lsa_pipe);