The Samba-Bugzilla – Attachment 808 Details for
Bug 2086
rpcclient: const char ** is incompatible with char *const *
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
rpcclient patch
rpcclient2.patch (text/plain), 32.72 KB, created by
Jason Mader (mail bounces back)
on 2004-11-24 13:24:03 UTC
(
hide
)
Description:
rpcclient patch
Filename:
MIME Type:
Creator:
Jason Mader (mail bounces back)
Created:
2004-11-24 13:24:03 UTC
Size:
32.72 KB
patch
obsolete
>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 14:07:52 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 14:07:52 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 14:07:52 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 14:07:52 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 14:07:52 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 14:07:52 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 14:07:52 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 14:07:52 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/cmd_spoolss.c rpcclient/cmd_spoolss.c >--- /tmp/samba-3.0.9/source/rpcclient/cmd_spoolss.c Mon Nov 15 22:03:12 2004 >+++ rpcclient/cmd_spoolss.c Wed Nov 24 14:39:45 2004 >@@ -100,7 +100,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; >@@ -314,7 +314,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; >@@ -443,7 +443,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; >@@ -495,7 +495,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; >@@ -565,7 +565,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; >@@ -635,7 +635,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; >@@ -757,7 +757,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; >@@ -828,7 +828,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; >@@ -1013,7 +1013,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; >@@ -1111,7 +1111,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; >@@ -1206,7 +1206,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; >@@ -1350,7 +1350,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; >@@ -1412,7 +1412,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; >@@ -1469,7 +1469,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; >@@ -1547,7 +1547,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; > >@@ -1602,7 +1602,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; >@@ -1644,7 +1644,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; >@@ -1687,7 +1687,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; >@@ -1746,7 +1746,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; >@@ -1804,7 +1804,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; >@@ -1868,7 +1868,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; >@@ -1915,7 +1915,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; >@@ -1983,7 +1983,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; >@@ -2104,7 +2104,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; >@@ -2179,7 +2179,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; >@@ -2238,7 +2238,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; >@@ -2303,7 +2303,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; >@@ -2375,7 +2375,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; >diff -u /tmp/samba-3.0.9/source/rpcclient/cmd_srvsvc.c rpcclient/cmd_srvsvc.c >--- /tmp/samba-3.0.9/source/rpcclient/cmd_srvsvc.c Mon Nov 15 22:03:12 2004 >+++ rpcclient/cmd_srvsvc.c Wed Nov 24 15:20:38 2004 >@@ -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; >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 14:40:37 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,12 +559,12 @@ > /* 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)); > } > } else { >- wresult = cmd_entry->wfn( cli, mem_ctx, argc, (const char **) argv); >+ wresult = cmd_entry->wfn( cli, mem_ctx, argc, (char *const *) argv); > /* print out the DOS error */ > if (!W_ERROR_IS_OK(wresult)) { > printf( "result was %s\n", dos_errstr(wresult)); >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 14:14:43 2004 >@@ -31,9 +31,8 @@ > struct cmd_set { > 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); >+ NTSTATUS (*ntfn)(struct cli_state *cli, TALLOC_CTX *mem_ctx, int argc, 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;
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=808">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Actions:
View
Attachments on
bug 2086
:
807
| 808