Index: rpcclient/cmd_shutdown.c =================================================================== --- rpcclient/cmd_shutdown.c (revision 5885) +++ rpcclient/cmd_shutdown.c (working copy) @@ -28,7 +28,7 @@ nt shutdown init ****************************************************************************/ static NTSTATUS cmd_shutdown_init(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; fstring msg; @@ -83,7 +83,7 @@ ****************************************************************************/ static NTSTATUS cmd_shutdown_abort(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; Index: rpcclient/cmd_dfs.c =================================================================== --- rpcclient/cmd_dfs.c (revision 5885) +++ rpcclient/cmd_dfs.c (working copy) @@ -25,7 +25,7 @@ /* Check DFS is supported by the remote server */ static NTSTATUS cmd_dfs_exist(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { BOOL dfs_exists; NTSTATUS result; @@ -44,7 +44,7 @@ } static NTSTATUS cmd_dfs_add(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result; const char *entrypath, *servername, *sharename, *comment; @@ -68,7 +68,7 @@ } static NTSTATUS cmd_dfs_remove(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result; const char *entrypath, *servername, *sharename; @@ -169,7 +169,7 @@ /* Enumerate dfs shares */ static NTSTATUS cmd_dfs_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { DFS_INFO_CTR ctr; NTSTATUS result; @@ -192,7 +192,7 @@ } static NTSTATUS cmd_dfs_getinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result; const char *entrypath, *servername, *sharename; Index: rpcclient/cmd_reg.c =================================================================== --- rpcclient/cmd_reg.c (revision 5885) +++ rpcclient/cmd_reg.c (working copy) @@ -894,7 +894,7 @@ nt registry shutdown ****************************************************************************/ static NTSTATUS cmd_reg_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; fstring msg; @@ -949,7 +949,7 @@ ****************************************************************************/ static NTSTATUS cmd_reg_abort_shutdown(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; Index: rpcclient/cmd_echo.c =================================================================== --- rpcclient/cmd_echo.c (revision 5885) +++ rpcclient/cmd_echo.c (working copy) @@ -23,7 +23,7 @@ #include "rpcclient.h" static NTSTATUS cmd_echo_add_one(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 request = 1, response; NTSTATUS result; @@ -48,7 +48,7 @@ } static NTSTATUS cmd_echo_data(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 size, i; NTSTATUS result; @@ -86,7 +86,7 @@ static NTSTATUS cmd_echo_source_data(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { uint32 size, i; NTSTATUS result; @@ -117,7 +117,7 @@ } static NTSTATUS cmd_echo_sink_data(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 size, i; NTSTATUS result; Index: rpcclient/rpcclient.c =================================================================== --- rpcclient/rpcclient.c (revision 5885) +++ rpcclient/rpcclient.c (working copy) @@ -179,7 +179,7 @@ /* List the available commands on a given pipe */ static NTSTATUS cmd_listcommands(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { struct cmd_list *tmp; struct cmd_set *tmp_set; @@ -224,7 +224,7 @@ /* Display help on commands */ static NTSTATUS cmd_help(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { struct cmd_list *tmp; struct cmd_set *tmp_set; @@ -284,7 +284,7 @@ /* Change the debug level */ static NTSTATUS cmd_debuglevel(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { if (argc > 2) { printf("Usage: %s [debuglevel]\n", argv[0]); @@ -301,14 +301,14 @@ } static NTSTATUS cmd_quit(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { exit(0); return NT_STATUS_OK; /* NOTREACHED */ } static NTSTATUS cmd_sign(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { if (cli->pipe_auth_flags == (AUTH_PIPE_NTLMSSP|AUTH_PIPE_SIGN)) { return NT_STATUS_OK; @@ -324,7 +324,7 @@ } static NTSTATUS cmd_seal(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { if (cli->pipe_auth_flags == (AUTH_PIPE_NTLMSSP|AUTH_PIPE_SIGN|AUTH_PIPE_SEAL)) { return NT_STATUS_OK; @@ -340,7 +340,7 @@ } static NTSTATUS cmd_none(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { if (cli->pipe_auth_flags == 0) { return NT_STATUS_OK; @@ -356,7 +356,7 @@ } static NTSTATUS setup_schannel(struct cli_state *cli, int pipe_auth_flags, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS ret; static uchar zeros[16]; @@ -411,7 +411,7 @@ static NTSTATUS cmd_schannel(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { d_printf("Setting schannel - sign and seal\n"); return setup_schannel(cli, AUTH_PIPE_NETSEC | AUTH_PIPE_SIGN | AUTH_PIPE_SEAL, @@ -419,7 +419,7 @@ } static NTSTATUS cmd_schannel_sign(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { d_printf("Setting schannel - sign only\n"); return setup_schannel(cli, AUTH_PIPE_NETSEC | AUTH_PIPE_SIGN, @@ -561,12 +561,12 @@ pipe_idx = cmd_entry->pipe_idx; if ( cmd_entry->returntype == RPC_RTYPE_NTSTATUS ) { - ntresult = cmd_entry->ntfn(cli, mem_ctx, argc, (const char **) argv); + ntresult = cmd_entry->ntfn(cli, mem_ctx, argc, argv); if (!NT_STATUS_IS_OK(ntresult)) { printf("result was %s\n", nt_errstr(ntresult)); } } else { - wresult = cmd_entry->wfn( cli, mem_ctx, argc, (const char **) argv); + wresult = cmd_entry->wfn( cli, mem_ctx, argc, argv); /* print out the DOS error */ if (!W_ERROR_IS_OK(wresult)) { printf( "result was %s\n", dos_errstr(wresult)); Index: rpcclient/cmd_spoolss.c =================================================================== --- rpcclient/cmd_spoolss.c (revision 5885) +++ rpcclient/cmd_spoolss.c (working copy) @@ -95,7 +95,7 @@ */ static WERROR cmd_spoolss_not_implemented(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { printf ("(*) This command is not currently implemented.\n"); return WERR_OK; @@ -107,7 +107,7 @@ */ static WERROR cmd_spoolss_open_printer_ex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR werror; fstring printername; @@ -321,7 +321,7 @@ static WERROR cmd_spoolss_enum_printers(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; uint32 info_level = 1; @@ -450,7 +450,7 @@ static WERROR cmd_spoolss_enum_ports(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { WERROR result; uint32 needed, info_level = 1; @@ -502,7 +502,7 @@ */ static WERROR cmd_spoolss_setprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -572,7 +572,7 @@ */ static WERROR cmd_spoolss_setprintername(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -642,7 +642,7 @@ */ static WERROR cmd_spoolss_getprinter(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -764,7 +764,7 @@ */ static WERROR cmd_spoolss_getprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -835,7 +835,7 @@ */ static WERROR cmd_spoolss_getprinterdataex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -1020,7 +1020,7 @@ */ static WERROR cmd_spoolss_getdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR werror; @@ -1118,7 +1118,7 @@ */ static WERROR cmd_spoolss_enum_drivers(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR werror; uint32 info_level = 1; @@ -1218,7 +1218,7 @@ */ static WERROR cmd_spoolss_getdriverdir(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; fstring env; @@ -1362,7 +1362,7 @@ static WERROR cmd_spoolss_addprinterdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; uint32 level = 3; @@ -1424,7 +1424,7 @@ static WERROR cmd_spoolss_addprinterex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; uint32 level = 2; @@ -1481,7 +1481,7 @@ static WERROR cmd_spoolss_setdriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; WERROR result; @@ -1559,7 +1559,7 @@ static WERROR cmd_spoolss_deletedriverex(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result, ret = WERR_UNKNOWN_PRINTER_DRIVER; @@ -1614,7 +1614,7 @@ static WERROR cmd_spoolss_deletedriver(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; fstring servername; @@ -1656,7 +1656,7 @@ static WERROR cmd_spoolss_getprintprocdir(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; char *servername = NULL, *environment = NULL; @@ -1699,7 +1699,7 @@ /* Add a form */ static WERROR cmd_spoolss_addform(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND handle; WERROR werror; @@ -1758,7 +1758,7 @@ /* Set a form */ static WERROR cmd_spoolss_setform(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND handle; WERROR werror; @@ -1816,7 +1816,7 @@ /* Get a form */ static WERROR cmd_spoolss_getform(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND handle; WERROR werror; @@ -1880,7 +1880,7 @@ static WERROR cmd_spoolss_deleteform(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND handle; WERROR werror; @@ -1941,7 +1941,7 @@ static WERROR cmd_spoolss_enum_forms(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND handle; WERROR werror; @@ -2016,7 +2016,7 @@ static WERROR cmd_spoolss_setprinterdata(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { WERROR result; uint32 needed; @@ -2137,7 +2137,7 @@ static WERROR cmd_spoolss_enum_jobs(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { WERROR result; uint32 needed, level = 1, num_jobs, i; @@ -2212,7 +2212,7 @@ static WERROR cmd_spoolss_enum_data( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { WERROR result; uint32 i=0, val_needed, data_needed; @@ -2271,7 +2271,7 @@ static WERROR cmd_spoolss_enum_data_ex( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { WERROR result; uint32 needed, i; @@ -2336,7 +2336,7 @@ static WERROR cmd_spoolss_enum_printerkey( struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { WERROR result; uint32 needed, returned; @@ -2408,7 +2408,7 @@ static WERROR cmd_spoolss_rffpcnex(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { fstring servername, printername; POLICY_HND hnd; Index: rpcclient/cmd_samr.c =================================================================== --- rpcclient/cmd_samr.c (revision 5885) +++ rpcclient/cmd_samr.c (working copy) @@ -318,7 +318,7 @@ */ static NTSTATUS cmd_samr_query_user(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, user_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -437,7 +437,7 @@ */ static NTSTATUS cmd_samr_query_group(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, group_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -499,7 +499,7 @@ static NTSTATUS cmd_samr_query_usergroups(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, @@ -564,7 +564,7 @@ static NTSTATUS cmd_samr_query_useraliases(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -632,7 +632,7 @@ static NTSTATUS cmd_samr_query_groupmem(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, group_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -694,7 +694,7 @@ static NTSTATUS cmd_samr_enum_dom_users(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -771,7 +771,7 @@ static NTSTATUS cmd_samr_enum_dom_groups(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -844,7 +844,7 @@ static NTSTATUS cmd_samr_enum_als_groups(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -926,7 +926,7 @@ static NTSTATUS cmd_samr_query_aliasmem(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, alias_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1000,7 +1000,7 @@ static NTSTATUS cmd_samr_query_dispinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1134,7 +1134,7 @@ static NTSTATUS cmd_samr_query_dominfo(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1213,7 +1213,7 @@ static NTSTATUS cmd_samr_create_dom_user(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, user_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1269,7 +1269,7 @@ static NTSTATUS cmd_samr_create_dom_group(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, group_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1320,7 +1320,7 @@ static NTSTATUS cmd_samr_lookup_names(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; POLICY_HND connect_pol, domain_pol; @@ -1390,7 +1390,7 @@ static NTSTATUS cmd_samr_lookup_rids(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; POLICY_HND connect_pol, domain_pol; @@ -1446,7 +1446,7 @@ static NTSTATUS cmd_samr_delete_dom_user(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; POLICY_HND connect_pol, domain_pol, user_pol; @@ -1515,7 +1515,7 @@ */ static NTSTATUS cmd_samr_query_sec_obj(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol, user_pol, *pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1592,7 +1592,7 @@ static NTSTATUS cmd_samr_get_dom_pwinfo(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint16 unk_0, unk_1; @@ -1616,7 +1616,7 @@ static NTSTATUS cmd_samr_lookup_domain(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND connect_pol, domain_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; Index: rpcclient/cmd_lsarpc.c =================================================================== --- rpcclient/cmd_lsarpc.c (revision 5885) +++ rpcclient/cmd_lsarpc.c (working copy) @@ -64,7 +64,7 @@ static NTSTATUS cmd_lsa_query_info_policy(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -138,7 +138,7 @@ static NTSTATUS cmd_lsa_lookup_names(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -159,7 +159,7 @@ goto done; result = cli_lsa_lookup_names(cli, mem_ctx, &pol, argc - 1, - (const char**)(argv + 1), &sids, &types); + (const char **)argv+1, &sids, &types); if (!NT_STATUS_IS_OK(result) && NT_STATUS_V(result) != NT_STATUS_V(STATUS_SOME_UNMAPPED)) @@ -185,7 +185,7 @@ /* Resolve a list of SIDs to a list of names */ static NTSTATUS cmd_lsa_lookup_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -254,7 +254,7 @@ static NTSTATUS cmd_lsa_enum_trust_dom(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -315,7 +315,7 @@ static NTSTATUS cmd_lsa_enum_privilege(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -368,7 +368,7 @@ static NTSTATUS cmd_lsa_get_dispname(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -406,7 +406,7 @@ static NTSTATUS cmd_lsa_enum_sids(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -459,7 +459,7 @@ static NTSTATUS cmd_lsa_create_account(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND dom_pol; POLICY_HND user_pol; @@ -501,7 +501,7 @@ static NTSTATUS cmd_lsa_enum_privsaccounts(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND dom_pol; POLICY_HND user_pol; @@ -556,7 +556,7 @@ static NTSTATUS cmd_lsa_enum_acct_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND dom_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -603,7 +603,7 @@ static NTSTATUS cmd_lsa_add_acct_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND dom_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -627,7 +627,7 @@ goto done; result = cli_lsa_add_account_rights(cli, mem_ctx, &dom_pol, sid, - argc-2, argv+2); + argc-2, (const char **)argv+2); if (!NT_STATUS_IS_OK(result)) goto done; @@ -641,7 +641,7 @@ static NTSTATUS cmd_lsa_remove_acct_rights(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND dom_pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -665,7 +665,7 @@ goto done; result = cli_lsa_remove_account_rights(cli, mem_ctx, &dom_pol, sid, - False, argc-2, argv+2); + False, argc-2, (const char **)argv+2); if (!NT_STATUS_IS_OK(result)) goto done; @@ -679,7 +679,7 @@ static NTSTATUS cmd_lsa_lookup_priv_value(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -714,7 +714,7 @@ static NTSTATUS cmd_lsa_query_secobj(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; Index: rpcclient/cmd_netlogon.c =================================================================== --- rpcclient/cmd_netlogon.c (revision 5885) +++ rpcclient/cmd_netlogon.c (working copy) @@ -24,7 +24,7 @@ static NTSTATUS cmd_netlogon_logon_ctrl2(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { uint32 query_level = 1; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -47,7 +47,7 @@ static NTSTATUS cmd_netlogon_getdcname(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { fstring dcname; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -72,7 +72,7 @@ static NTSTATUS cmd_netlogon_logon_ctrl(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { #if 0 uint32 query_level = 1; @@ -168,7 +168,7 @@ static NTSTATUS cmd_netlogon_sam_sync(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32 database_id = 0, num_deltas; @@ -207,7 +207,7 @@ static NTSTATUS cmd_netlogon_sam_deltas(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; uint32 database_id, num_deltas, tmp; @@ -245,7 +245,7 @@ static NTSTATUS cmd_netlogon_sam_logon(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; int logon_type = NET_LOGON_TYPE; @@ -294,7 +294,7 @@ static NTSTATUS cmd_netlogon_change_trust_pw(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; DOM_CRED ret_creds; Index: rpcclient/rpcclient.h =================================================================== --- rpcclient/rpcclient.h (revision 5885) +++ rpcclient/rpcclient.h (working copy) @@ -32,8 +32,8 @@ const char *name; RPC_RETURN_TYPE returntype; NTSTATUS (*ntfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv); - WERROR (*wfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv); + char *const *argv); + WERROR (*wfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, char *const *argv); int pipe_idx; const char *description; const char *usage; Index: rpcclient/cmd_ds.c =================================================================== --- rpcclient/cmd_ds.c (revision 5885) +++ rpcclient/cmd_ds.c (working copy) @@ -26,7 +26,7 @@ static NTSTATUS cmd_ds_dsrole_getprimarydominfo(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result; DS_DOMINFO_CTR ctr; @@ -49,7 +49,7 @@ static NTSTATUS cmd_ds_enum_domain_trusts(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { NTSTATUS result; uint32 flags = 0x1; Index: rpcclient/cmd_srvsvc.c =================================================================== --- rpcclient/cmd_srvsvc.c (revision 5885) +++ rpcclient/cmd_srvsvc.c (working copy) @@ -181,7 +181,7 @@ /* Server query info */ static WERROR cmd_srvsvc_srv_query_info(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 info_level = 101; SRV_INFO_CTR ctr; @@ -267,7 +267,7 @@ static WERROR cmd_srvsvc_net_share_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 info_level = 2; SRV_SHARE_INFO_CTR ctr; @@ -317,7 +317,7 @@ static WERROR cmd_srvsvc_net_remote_tod(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { TIME_OF_DAY_INFO tod; WERROR result; @@ -339,7 +339,7 @@ static WERROR cmd_srvsvc_net_file_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx, - int argc, const char **argv) + int argc, char *const *argv) { uint32 info_level = 3; SRV_FILE_INFO_CTR ctr;