diff options
| author | Jeremy Allison <jra@samba.org> | 2008-01-15 10:19:47 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-01-15 10:19:47 -0800 |
| commit | 9c63e1820bab51a7cc09878d78ddce061c3292ec (patch) | |
| tree | 9e88fcb9ad8012e26c1e70b9e0a07b1f23f9e39f /source3/utils/net_rpc.c | |
| parent | 19e4e99bfb02b8fa722883b04237ad714d402cb3 (diff) | |
| parent | ee8cf0ce40820b3e1ec025339f2b25c0001fda13 (diff) | |
| download | samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.tar.gz samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.tar.bz2 samba-9c63e1820bab51a7cc09878d78ddce061c3292ec.zip | |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
(This used to be commit 6e17a56039be13ac1ef7004f15d154141bad7196)
Diffstat (limited to 'source3/utils/net_rpc.c')
| -rw-r--r-- | source3/utils/net_rpc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c index 2bd867fff3..677924649c 100644 --- a/source3/utils/net_rpc.c +++ b/source3/utils/net_rpc.c @@ -51,7 +51,8 @@ static bool sync_files(struct copy_clistate *cp_clistate, const char *mask); **/ NTSTATUS net_get_remote_domain_sid(struct cli_state *cli, TALLOC_CTX *mem_ctx, - DOM_SID **domain_sid, char **domain_name) + DOM_SID **domain_sid, + const char **domain_name) { struct rpc_pipe_client *lsa_pipe; POLICY_HND pol; @@ -112,7 +113,7 @@ int run_rpc_command(struct cli_state *cli_arg, TALLOC_CTX *mem_ctx; NTSTATUS nt_status; DOM_SID *domain_sid; - char *domain_name; + const char *domain_name; /* make use of cli_state handed over as an argument, if possible */ if (!cli_arg) { @@ -5607,7 +5608,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) DOM_SID *domain_sid; char* domain_name; - char* domain_name_pol; + const char* domain_name_pol; char* acct_name; fstring pdc_name; char *dc_name; @@ -5917,7 +5918,7 @@ static int rpc_trustdom_vampire(int argc, const char **argv) DOM_SID *domain_sids; char **trusted_dom_names; fstring pdc_name; - char *dummy; + const char *dummy; /* * Listing trusted domains (stored in secrets.tdb, if local) @@ -6057,7 +6058,7 @@ static int rpc_trustdom_list(int argc, const char **argv) DOM_SID *domain_sids; char **trusted_dom_names; fstring pdc_name; - char *dummy; + const char *dummy; /* trusting domains listing variables */ POLICY_HND domain_hnd; |