Only in rpcclient: .cmd_shutdown.c.swp diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_dfs.c rpcclient/cmd_dfs.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_dfs.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_dfs.c Wed Nov 24 12:49:01 2004 @@ -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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_ds.c rpcclient/cmd_ds.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_ds.c Mon Nov 15 22:03:13 2004 +++ rpcclient/cmd_ds.c Wed Nov 24 12:50:33 2004 @@ -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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_echo.c rpcclient/cmd_echo.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_echo.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_echo.c Wed Nov 24 12:51:02 2004 @@ -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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_lsarpc.c rpcclient/cmd_lsarpc.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_lsarpc.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_lsarpc.c Wed Nov 24 12:40:19 2004 @@ -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)) @@ -183,7 +183,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; @@ -250,7 +250,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; @@ -305,7 +305,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; @@ -358,7 +358,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; @@ -396,7 +396,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; @@ -449,7 +449,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; @@ -504,7 +504,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; @@ -551,7 +551,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; @@ -575,7 +575,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; @@ -589,7 +589,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; @@ -613,7 +613,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; @@ -627,7 +627,7 @@ static NTSTATUS cmd_lsa_lookupprivvalue(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, - const char **argv) + char *const *argv) { POLICY_HND pol; NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -662,7 +662,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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_netlogon.c rpcclient/cmd_netlogon.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_netlogon.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_netlogon.c Wed Nov 24 12:46:46 2004 @@ -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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_reg.c rpcclient/cmd_reg.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_reg.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_reg.c Wed Nov 24 12:49:41 2004 @@ -895,7 +895,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; @@ -950,7 +950,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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_samr.c rpcclient/cmd_samr.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_samr.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_samr.c Wed Nov 24 12:43:40 2004 @@ -265,7 +265,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; @@ -374,7 +374,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; @@ -436,7 +436,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, @@ -501,7 +501,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; @@ -569,7 +569,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; @@ -631,7 +631,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; @@ -705,7 +705,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; @@ -778,7 +778,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; @@ -860,7 +860,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; @@ -934,7 +934,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; @@ -1068,7 +1068,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; @@ -1138,7 +1138,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; @@ -1194,7 +1194,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; @@ -1264,7 +1264,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; @@ -1321,7 +1321,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; @@ -1390,7 +1390,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; @@ -1467,7 +1467,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; @@ -1491,7 +1491,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; diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_shutdown.c rpcclient/cmd_shutdown.c --- /tmp/samba-3.0.9/source/rpcclient/cmd_shutdown.c Mon Nov 15 22:03:12 2004 +++ rpcclient/cmd_shutdown.c Wed Nov 24 12:51:51 2004 @@ -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; diff -u /tmp/samba-3.0.9/source/rpcclient/rpcclient.c rpcclient/rpcclient.c --- /tmp/samba-3.0.9/source/rpcclient/rpcclient.c Mon Nov 15 22:03:12 2004 +++ rpcclient/rpcclient.c Wed Nov 24 12:31:05 2004 @@ -178,7 +178,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; @@ -223,7 +223,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; @@ -283,7 +283,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]); @@ -300,7 +300,7 @@ } 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 */ @@ -307,7 +307,7 @@ } 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; @@ -323,7 +323,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; @@ -339,7 +339,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; @@ -355,7 +355,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]; @@ -410,7 +410,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, @@ -418,7 +418,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, @@ -559,7 +559,7 @@ /* Run command */ 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, (char *const *) argv); if (!NT_STATUS_IS_OK(ntresult)) { printf("result was %s\n", nt_errstr(ntresult)); } diff -u /tmp/samba-3.0.9/source/rpcclient/rpcclient.h rpcclient/rpcclient.h --- /tmp/samba-3.0.9/source/rpcclient/rpcclient.h Mon Nov 15 22:03:12 2004 +++ rpcclient/rpcclient.h Wed Nov 24 12:24:41 2004 @@ -32,7 +32,7 @@ const char *name; RPC_RETURN_TYPE returntype; NTSTATUS (*ntfn)(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, const char **argv); int pipe_idx; const char *description;