From c5fbb6f23c2d399c7510bc552cdb1a27b1ef66a8 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 4 Aug 2004 13:23:35 +0000 Subject: r1654: rename cli_ -> smbcli_ rename CLI_ -> SMBCLI_ metze (This used to be commit 8441750fd9427dd6fe477f27e603821b4026f038) --- source4/utils/net.c | 12 +- source4/utils/net_ads.c | 8 +- source4/utils/net_rap.c | 172 ++++++++++++++-------------- source4/utils/net_rpc.c | 248 ++++++++++++++++++++-------------------- source4/utils/net_rpc_join.c | 48 ++++---- source4/utils/net_rpc_samsync.c | 28 ++--- source4/utils/net_time.c | 18 +-- 7 files changed, 267 insertions(+), 267 deletions(-) (limited to 'source4/utils') diff --git a/source4/utils/net.c b/source4/utils/net.c index 5ccc50242f..6db62ea6b0 100644 --- a/source4/utils/net.c +++ b/source4/utils/net.c @@ -105,7 +105,7 @@ int net_run_function(int argc, const char **argv, struct functable *table, /**************************************************************************** connect to \\server\ipc$ ****************************************************************************/ -NTSTATUS connect_to_ipc(struct cli_state **c, struct in_addr *server_ip, +NTSTATUS connect_to_ipc(struct smbcli_state **c, struct in_addr *server_ip, const char *server_name) { NTSTATUS nt_status; @@ -117,7 +117,7 @@ NTSTATUS connect_to_ipc(struct cli_state **c, struct in_addr *server_ip, } } - nt_status = cli_full_connection(c, opt_requester_name, server_name, + nt_status = smbcli_full_connection(c, opt_requester_name, server_name, server_ip, opt_port, "IPC$", "IPC", opt_user_name, opt_workgroup, @@ -142,12 +142,12 @@ NTSTATUS connect_to_ipc(struct cli_state **c, struct in_addr *server_ip, /**************************************************************************** connect to \\server\ipc$ anonymously ****************************************************************************/ -NTSTATUS connect_to_ipc_anonymous(struct cli_state **c, +NTSTATUS connect_to_ipc_anonymous(struct smbcli_state **c, struct in_addr *server_ip, const char *server_name) { NTSTATUS nt_status; - nt_status = cli_full_connection(c, opt_requester_name, server_name, + nt_status = smbcli_full_connection(c, opt_requester_name, server_name, server_ip, opt_port, "IPC$", "IPC", "", "", @@ -248,11 +248,11 @@ BOOL net_find_dc(struct in_addr *server_ip, fstring server_name, const char *dom } -struct cli_state *net_make_ipc_connection(uint_t flags) +struct smbcli_state *net_make_ipc_connection(uint_t flags) { char *server_name = NULL; struct in_addr server_ip; - struct cli_state *cli = NULL; + struct smbcli_state *cli = NULL; NTSTATUS nt_status; if (!net_find_server(flags, &server_ip, &server_name)) { diff --git a/source4/utils/net_ads.c b/source4/utils/net_ads.c index 9febb694a9..f7bfdcac3b 100644 --- a/source4/utils/net_ads.c +++ b/source4/utils/net_ads.c @@ -768,7 +768,7 @@ static int net_ads_printer_publish(int argc, const char **argv) ADS_STRUCT *ads; ADS_STATUS rc; const char *servername; - struct cli_state *cli; + struct smbcli_state *cli; struct in_addr server_ip; NTSTATUS nt_status; TALLOC_CTX *mem_ctx = talloc_init("net_ads_printer_publish"); @@ -793,15 +793,15 @@ static int net_ads_printer_publish(int argc, const char **argv) resolve_name(servername, &server_ip, 0x20); - nt_status = cli_full_connection(&cli, lp_netbios_name(), servername, + nt_status = smbcli_full_connection(&cli, lp_netbios_name(), servername, &server_ip, 0, "IPC$", "IPC", opt_user_name, opt_workgroup, opt_password ? opt_password : "", - CLI_FULL_CONNECTION_USE_KERBEROS, + SMBCLI_FULL_CONNECTION_USE_KERBEROS, NULL); - cli_nt_session_open(cli, PI_SPOOLSS); + smbcli_nt_session_open(cli, PI_SPOOLSS); get_remote_printer_publishing_data(cli, mem_ctx, &mods, argv[0]); rc = ads_add_printer_entry(ads, prt_dn, mem_ctx, &mods); diff --git a/source4/utils/net_rap.c b/source4/utils/net_rap.c index c97b9dc9c1..77875d3733 100644 --- a/source4/utils/net_rap.c +++ b/source4/utils/net_rap.c @@ -77,7 +77,7 @@ static void one_file_fn(const char *pPath, const char *pUser, uint16_t perms, static int rap_file_close(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { d_printf("\nMissing fileid of file to close\n\n"); @@ -87,14 +87,14 @@ static int rap_file_close(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetFileClose(cli, atoi(argv[0])); - cli_shutdown(cli); + ret = smbcli_NetFileClose(cli, atoi(argv[0])); + smbcli_shutdown(cli); return ret; } static int rap_file_info(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) return net_rap_file_usage(argc, argv); @@ -102,8 +102,8 @@ static int rap_file_info(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetFileGetInfo(cli, atoi(argv[0]), one_file_fn); - cli_shutdown(cli); + ret = smbcli_NetFileGetInfo(cli, atoi(argv[0]), one_file_fn); + smbcli_shutdown(cli); return ret; } @@ -126,7 +126,7 @@ int net_rap_file(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -137,8 +137,8 @@ int net_rap_file(int argc, const char **argv) "\nEnumerating open files on remote server:\n\n"\ "\nFileId Opened by Perms Locks Path \n"\ "------ --------- ----- ----- ---- \n"); - ret = cli_NetFileEnum(cli, NULL, NULL, file_fn); - cli_shutdown(cli); + ret = smbcli_NetFileEnum(cli, NULL, NULL, file_fn); + smbcli_shutdown(cli); return ret; } @@ -165,7 +165,7 @@ static void share_fn(const char *share_name, uint32_t type, static int rap_share_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { @@ -176,14 +176,14 @@ static int rap_share_delete(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetShareDelete(cli, argv[0]); - cli_shutdown(cli); + ret = smbcli_NetShareDelete(cli, argv[0]); + smbcli_shutdown(cli); return ret; } static int rap_share_add(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; RAP_SHARE_INFO_2 sinfo; @@ -212,8 +212,8 @@ static int rap_share_add(int argc, const char **argv) memset(sinfo.password, '\0', sizeof(sinfo.password)); sinfo.reserved2 = '\0'; - ret = cli_NetShareAdd(cli, &sinfo); - cli_shutdown(cli); + ret = smbcli_NetShareAdd(cli, &sinfo); + smbcli_shutdown(cli); return ret; } @@ -228,7 +228,7 @@ int net_rap_share(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -239,10 +239,10 @@ int net_rap_share(int argc, const char **argv) "\nEnumerating shared resources (exports) on remote server:\n\n"\ "\nShare name Type Description\n"\ "---------- ---- -----------\n"); - ret = cli_RNetShareEnum(cli, long_share_fn, NULL); + ret = smbcli_RNetShareEnum(cli, long_share_fn, NULL); } - ret = cli_RNetShareEnum(cli, share_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetShareEnum(cli, share_fn, NULL); + smbcli_shutdown(cli); return ret; } @@ -310,7 +310,7 @@ static void display_conns_func(uint16_t conn_id, uint16_t conn_type, uint16_t op static int rap_session_info(int argc, const char **argv) { const char *sessname; - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -321,22 +321,22 @@ static int rap_session_info(int argc, const char **argv) sessname = argv[0]; - ret = cli_NetSessionGetInfo(cli, sessname, display_session_func); + ret = smbcli_NetSessionGetInfo(cli, sessname, display_session_func); if (ret < 0) { - cli_shutdown(cli); + smbcli_shutdown(cli); return ret; } d_printf("Share name Type # Opens\n-------------------------"\ "-----------------------------------------------------\n"); - ret = cli_NetConnectionEnum(cli, sessname, display_conns_func); - cli_shutdown(cli); + ret = smbcli_NetConnectionEnum(cli, sessname, display_conns_func); + smbcli_shutdown(cli); return ret; } static int rap_session_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -345,8 +345,8 @@ static int rap_session_delete(int argc, const char **argv) if (argc == 0) return net_rap_session_usage(argc, argv); - ret = cli_NetSessionDel(cli, argv[0]); - cli_shutdown(cli); + ret = smbcli_NetSessionDel(cli, argv[0]); + smbcli_shutdown(cli); return ret; } @@ -360,7 +360,7 @@ int net_rap_session(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -370,9 +370,9 @@ int net_rap_session(int argc, const char **argv) "Client Type Opens Idle time\n"\ "------------------------------------------"\ "------------------------------------\n"); - ret = cli_NetSessionEnum(cli, list_sessions_func); + ret = smbcli_NetSessionEnum(cli, list_sessions_func); - cli_shutdown(cli); + smbcli_shutdown(cli); return ret; } @@ -402,7 +402,7 @@ int net_rap_server_usage(int argc, const char **argv) int net_rap_server(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -412,9 +412,9 @@ int net_rap_server(int argc, const char **argv) "\tServer name Server description\n"\ "\t------------- ----------------------------\n"); - ret = cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_ALL, + ret = smbcli_NetServerEnum(cli, cli->server_domain, SV_TYPE_ALL, display_server_func,NULL); - cli_shutdown(cli); + smbcli_shutdown(cli); return ret; } @@ -430,7 +430,7 @@ int net_rap_domain_usage(int argc, const char **argv) int net_rap_domain(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) @@ -440,9 +440,9 @@ int net_rap_domain(int argc, const char **argv) "\tDomain name Server name of Browse Master\n"\ "\t------------- ----------------------------\n"); - ret = cli_NetServerEnum(cli, cli->server_domain, SV_TYPE_DOMAIN_ENUM, + ret = smbcli_NetServerEnum(cli, cli->server_domain, SV_TYPE_DOMAIN_ENUM, display_server_func,NULL); - cli_shutdown(cli); + smbcli_shutdown(cli); return ret; } @@ -525,7 +525,7 @@ static void enum_jobs(uint16_t jobid, const char *ownername, static int rap_printq_info(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) @@ -535,14 +535,14 @@ static int rap_printq_info(int argc, const char **argv) return -1; d_printf(PRINTQ_ENUM_DISPLAY, cli->desthost); /* list header */ - ret = cli_NetPrintQGetInfo(cli, argv[0], enum_queue, enum_jobs); - cli_shutdown(cli); + ret = smbcli_NetPrintQGetInfo(cli, argv[0], enum_queue, enum_jobs); + smbcli_shutdown(cli); return ret; } static int rap_printq_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) @@ -551,14 +551,14 @@ static int rap_printq_delete(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_printjob_del(cli, atoi(argv[0])); - cli_shutdown(cli); + ret = smbcli_printjob_del(cli, atoi(argv[0])); + smbcli_shutdown(cli); return ret; } int net_rap_printq(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; struct functable func[] = { @@ -572,8 +572,8 @@ int net_rap_printq(int argc, const char **argv) return -1; d_printf(PRINTQ_ENUM_DISPLAY, cli->desthost); /* list header */ - ret = cli_NetPrintQEnum(cli, enum_queue, enum_jobs); - cli_shutdown(cli); + ret = smbcli_NetPrintQEnum(cli, enum_queue, enum_jobs); + smbcli_shutdown(cli); return ret; } @@ -608,7 +608,7 @@ static void group_member_fn(const char *user_name, void *state) static int rap_user_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { @@ -619,14 +619,14 @@ static int rap_user_delete(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetUserDelete(cli, argv[0]); - cli_shutdown(cli); + ret = smbcli_NetUserDelete(cli, argv[0]); + smbcli_shutdown(cli); return ret; } static int rap_user_add(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; RAP_USER_INFO_1 userinfo; @@ -649,15 +649,15 @@ static int rap_user_add(int argc, const char **argv) userinfo.home_dir = NULL; userinfo.logon_script = NULL; - ret = cli_NetUserAdd(cli, &userinfo); + ret = smbcli_NetUserAdd(cli, &userinfo); - cli_shutdown(cli); + smbcli_shutdown(cli); return ret; } static int rap_user_info(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { d_printf("\n\nUser name not specified\n"); @@ -667,8 +667,8 @@ static int rap_user_info(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetUserGetGroups(cli, argv[0], group_member_fn, NULL); - cli_shutdown(cli); + ret = smbcli_NetUserGetGroups(cli, argv[0], group_member_fn, NULL); + smbcli_shutdown(cli); return ret; } @@ -683,18 +683,18 @@ int net_rap_user(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; if (!(cli = net_make_ipc_connection(0))) goto done; if (opt_long_list_entries) { d_printf("\nUser name Comment"\ "\n-----------------------------\n"); - ret = cli_RNetUserEnum(cli, long_user_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetUserEnum(cli, long_user_fn, NULL); + smbcli_shutdown(cli); goto done; } - ret = cli_RNetUserEnum(cli, user_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetUserEnum(cli, user_fn, NULL); + smbcli_shutdown(cli); goto done; } @@ -725,7 +725,7 @@ static void group_fn(const char *group_name, const char *comment, void *state) static int rap_group_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { d_printf("\n\nGroup name not specified\n"); @@ -735,14 +735,14 @@ static int rap_group_delete(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetGroupDelete(cli, argv[0]); - cli_shutdown(cli); + ret = smbcli_NetGroupDelete(cli, argv[0]); + smbcli_shutdown(cli); return ret; } static int rap_group_add(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; RAP_GROUP_INFO_1 grinfo; @@ -759,8 +759,8 @@ static int rap_group_add(int argc, const char **argv) grinfo.reserved1 = '\0'; grinfo.comment = smb_xstrdup(opt_comment); - ret = cli_NetGroupAdd(cli, &grinfo); - cli_shutdown(cli); + ret = smbcli_NetGroupAdd(cli, &grinfo); + smbcli_shutdown(cli); return ret; } @@ -773,19 +773,19 @@ int net_rap_group(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) return -1; if (opt_long_list_entries) { d_printf("Group name Comment\n"); d_printf("-----------------------------\n"); - ret = cli_RNetGroupEnum(cli, long_group_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetGroupEnum(cli, long_group_fn, NULL); + smbcli_shutdown(cli); return ret; } - ret = cli_RNetGroupEnum(cli, group_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetGroupEnum(cli, group_fn, NULL); + smbcli_shutdown(cli); return ret; } @@ -809,7 +809,7 @@ int net_rap_groupmember_usage(int argc, const char **argv) static int rap_groupmember_add(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc != 2) { d_printf("\n\nGroup or user name not specified\n"); @@ -819,14 +819,14 @@ static int rap_groupmember_add(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetGroupAddUser(cli, argv[0], argv[1]); - cli_shutdown(cli); + ret = smbcli_NetGroupAddUser(cli, argv[0], argv[1]); + smbcli_shutdown(cli); return ret; } static int rap_groupmember_delete(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc != 2) { d_printf("\n\nGroup or user name not specified\n"); @@ -836,14 +836,14 @@ static int rap_groupmember_delete(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetGroupDelUser(cli, argv[0], argv[1]); - cli_shutdown(cli); + ret = smbcli_NetGroupDelUser(cli, argv[0], argv[1]); + smbcli_shutdown(cli); return ret; } static int rap_groupmember_list(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc == 0) { d_printf("\n\nGroup name not specified\n"); @@ -853,8 +853,8 @@ static int rap_groupmember_list(int argc, const char **argv) if (!(cli = net_make_ipc_connection(0))) return -1; - ret = cli_NetGroupGetUsers(cli, argv[0], group_member_fn, NULL ); - cli_shutdown(cli); + ret = smbcli_NetGroupGetUsers(cli, argv[0], group_member_fn, NULL ); + smbcli_shutdown(cli); return ret; } @@ -918,7 +918,7 @@ int net_rap_service(int argc, const char **argv) }; if (argc == 0) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (!(cli = net_make_ipc_connection(0))) return -1; @@ -926,10 +926,10 @@ int net_rap_service(int argc, const char **argv) if (opt_long_list_entries) { d_printf("Service name Comment\n"); d_printf("-----------------------------\n"); - ret = cli_RNetServiceEnum(cli, long_group_fn, NULL); + ret = smbcli_RNetServiceEnum(cli, long_group_fn, NULL); } - ret = cli_RNetServiceEnum(cli, group_fn, NULL); - cli_shutdown(cli); + ret = smbcli_RNetServiceEnum(cli, group_fn, NULL); + smbcli_shutdown(cli); return ret; } @@ -948,7 +948,7 @@ int net_rap_password_usage(int argc, const char **argv) int net_rap_password(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; int ret; if (argc < 3) @@ -958,8 +958,8 @@ int net_rap_password(int argc, const char **argv) return -1; /* BB Add check for password lengths? */ - ret = cli_oem_change_password(cli, argv[0], argv[2], argv[1]); - cli_shutdown(cli); + ret = smbcli_oem_change_password(cli, argv[0], argv[2], argv[1]); + smbcli_shutdown(cli); return ret; } diff --git a/source4/utils/net_rpc.c b/source4/utils/net_rpc.c index fb42493a8b..2d1120e882 100644 --- a/source4/utils/net_rpc.c +++ b/source4/utils/net_rpc.c @@ -37,18 +37,18 @@ /* A function of this type is passed to the 'run_rpc_command' wrapper */ -typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, struct cli_state *, TALLOC_CTX *, int, const char **); +typedef NTSTATUS (*rpc_command_fn)(const DOM_SID *, struct smbcli_state *, TALLOC_CTX *, int, const char **); /** * Many of the RPC functions need the domain sid. This function gets * it at the start of every run * - * @param cli A cli_state already connected to the remote machine + * @param cli A smbcli_state already connected to the remote machine * * @return The Domain SID of the remote machine. **/ -static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli) +static DOM_SID *net_get_remote_domain_sid(struct smbcli_state *cli) { DOM_SID *domain_sid; POLICY_HND pol; @@ -69,26 +69,26 @@ static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli) } - if (!cli_nt_session_open (cli, PI_LSARPC)) { + if (!smbcli_nt_session_open (cli, PI_LSARPC)) { fprintf(stderr, "could not initialise lsa pipe\n"); goto error; } - result = cli_lsa_open_policy(cli, mem_ctx, True, + result = smbcli_lsa_open_policy(cli, mem_ctx, True, SEC_RIGHTS_MAXIMUM_ALLOWED, &pol); if (!NT_STATUS_IS_OK(result)) { goto error; } - result = cli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, + result = smbcli_lsa_query_info_policy(cli, mem_ctx, &pol, info_class, domain_name, domain_sid); if (!NT_STATUS_IS_OK(result)) { goto error; } - cli_lsa_close(cli, mem_ctx, &pol); - cli_nt_session_close(cli); + smbcli_lsa_close(cli, mem_ctx, &pol); + smbcli_nt_session_close(cli); talloc_destroy(mem_ctx); return domain_sid; @@ -115,20 +115,20 @@ static DOM_SID *net_get_remote_domain_sid(struct cli_state *cli) * @return A shell status integer (0 for success) */ -static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int conn_flags, +static int run_rpc_command(struct smbcli_state *smbcli_arg, const int pipe_idx, int conn_flags, rpc_command_fn fn, int argc, const char **argv) { - struct cli_state *cli = NULL; + struct smbcli_state *cli = NULL; TALLOC_CTX *mem_ctx; NTSTATUS nt_status; DOM_SID *domain_sid; - /* make use of cli_state handed over as an argument, if possible */ - if (!cli_arg) + /* make use of smbcli_state handed over as an argument, if possible */ + if (!smbcli_arg) cli = net_make_ipc_connection(conn_flags); else - cli = cli_arg; + cli = smbcli_arg; if (!cli) { return -1; @@ -140,11 +140,11 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co if (!(mem_ctx = talloc_init("run_rpc_command"))) { DEBUG(0, ("talloc_init() failed\n")); - cli_shutdown(cli); + smbcli_shutdown(cli); return -1; } - if (!cli_nt_session_open(cli, pipe_idx)) { + if (!smbcli_nt_session_open(cli, pipe_idx)) { DEBUG(0, ("Could not initialise pipe\n")); } @@ -158,11 +158,11 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co if (cli->nt_pipe_fnum) - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); /* close the connection only if it was opened here */ - if (!cli_arg) - cli_shutdown(cli); + if (!smbcli_arg) + smbcli_shutdown(cli); talloc_destroy(mem_ctx); @@ -180,7 +180,7 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co * argc, argv which are passes through. * * @param domain_sid The domain sid aquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on compleation of the function. * @param argc Standard main() style argc * @param argc Standard main() style argv. Initial components are already @@ -189,7 +189,7 @@ static int run_rpc_command(struct cli_state *cli_arg, const int pipe_idx, int co * @return Normal NTSTATUS return. **/ -static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_changetrustpw_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { return trust_pw_find_change_and_store_it(cli, mem_ctx, opt_target_workgroup); @@ -226,7 +226,7 @@ static int rpc_changetrustpw(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid aquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on compleation of the function. * @param argc Standard main() style argc * @param argc Standard main() style argv. Initial components are already @@ -235,7 +235,7 @@ static int rpc_changetrustpw(int argc, const char **argv) * @return Normal NTSTATUS return. **/ -static NTSTATUS rpc_join_oldstyle_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_join_oldstyle_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { fstring trust_passwd; @@ -335,7 +335,7 @@ int net_rpc_join(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -345,7 +345,7 @@ int net_rpc_join(int argc, const char **argv) **/ static NTSTATUS -rpc_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_info_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol; @@ -356,14 +356,14 @@ rpc_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, sid_to_string(sid_str, domain_sid); /* Get sam policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; } /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -371,7 +371,7 @@ rpc_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, } ZERO_STRUCT(ctr); - result = cli_samr_query_dom_info(cli, mem_ctx, &domain_pol, + result = smbcli_samr_query_dom_info(cli, mem_ctx, &domain_pol, 2, &ctr); if (NT_STATUS_IS_OK(result)) { TALLOC_CTX *ctx = talloc_init("rpc_info_internals"); @@ -410,7 +410,7 @@ int net_rpc_info(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -420,7 +420,7 @@ int net_rpc_info(int argc, const char **argv) **/ static NTSTATUS -rpc_getsid_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_getsid_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { fstring sid_str; @@ -473,7 +473,7 @@ static int rpc_user_usage(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -482,7 +482,7 @@ static int rpc_user_usage(int argc, const char **argv) * @return Normal NTSTATUS return. **/ -static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol, user_pol; @@ -501,7 +501,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct cli_sta /* Get sam policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; @@ -509,7 +509,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct cli_sta /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -521,7 +521,7 @@ static NTSTATUS rpc_user_add_internals(const DOM_SID *domain_sid, struct cli_sta acb_info = ACB_NORMAL; unknown = 0xe005000b; /* No idea what this is - a permission mask? */ - result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol, + result = smbcli_samr_create_dom_user(cli, mem_ctx, &domain_pol, acct_name, acb_info, unknown, &user_pol, &user_rid); if (!NT_STATUS_IS_OK(result)) { @@ -561,7 +561,7 @@ static int rpc_user_add(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -571,7 +571,7 @@ static int rpc_user_add(int argc, const char **argv) **/ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, - struct cli_state *cli, + struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { @@ -585,14 +585,14 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, } /* Get sam policy and domain handles */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; } - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); @@ -606,7 +606,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, uint32_t *user_rids, num_rids, *name_types; uint32_t flags = 0x000003e8; /* Unknown */ - result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, + result = smbcli_samr_lookup_names(cli, mem_ctx, &domain_pol, flags, 1, &argv[0], &num_rids, &user_rids, &name_types); @@ -615,7 +615,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, goto done; } - result = cli_samr_open_user(cli, mem_ctx, &domain_pol, + result = smbcli_samr_open_user(cli, mem_ctx, &domain_pol, MAXIMUM_ALLOWED_ACCESS, user_rids[0], &user_pol); @@ -626,7 +626,7 @@ static NTSTATUS rpc_user_del_internals(const DOM_SID *domain_sid, /* Delete user */ - result = cli_samr_delete_dom_user(cli, mem_ctx, &user_pol); + result = smbcli_samr_delete_dom_user(cli, mem_ctx, &user_pol); if (!NT_STATUS_IS_OK(result)) { goto done; @@ -662,7 +662,7 @@ static int rpc_user_delete(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -672,7 +672,7 @@ static int rpc_user_delete(int argc, const char **argv) **/ static NTSTATUS -rpc_user_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_user_info_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol, user_pol; @@ -690,31 +690,31 @@ rpc_user_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, } /* Get sam policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) goto done; /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) goto done; /* Get handle on user */ - result = cli_samr_lookup_names(cli, mem_ctx, &domain_pol, + result = smbcli_samr_lookup_names(cli, mem_ctx, &domain_pol, flags, 1, &argv[0], &num_rids, &rids, &name_types); if (!NT_STATUS_IS_OK(result)) goto done; - result = cli_samr_open_user(cli, mem_ctx, &domain_pol, + result = smbcli_samr_open_user(cli, mem_ctx, &domain_pol, MAXIMUM_ALLOWED_ACCESS, rids[0], &user_pol); if (!NT_STATUS_IS_OK(result)) goto done; - result = cli_samr_query_usergroups(cli, mem_ctx, &user_pol, + result = smbcli_samr_query_usergroups(cli, mem_ctx, &user_pol, &num_rids, &user_gids); /* Look up rids */ @@ -724,7 +724,7 @@ rpc_user_info_internals(const DOM_SID *domain_sid, struct cli_state *cli, for (i = 0; i < num_rids; i++) rids[i] = user_gids[i].g_rid; - result = cli_samr_lookup_rids(cli, mem_ctx, &domain_pol, + result = smbcli_samr_lookup_rids(cli, mem_ctx, &domain_pol, flags, num_rids, rids, &num_names, &names, &name_types); @@ -764,7 +764,7 @@ static int rpc_user_info(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -774,7 +774,7 @@ static int rpc_user_info(int argc, const char **argv) **/ static NTSTATUS -rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_user_list_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol; @@ -785,7 +785,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, /* Get sam policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; @@ -793,7 +793,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -814,7 +814,7 @@ rpc_user_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, get_query_dispinfo_params( loop_count, &max_entries, &max_size); - result = cli_samr_query_dispinfo(cli, mem_ctx, &domain_pol, + result = smbcli_samr_query_dispinfo(cli, mem_ctx, &domain_pol, &start_idx, 1, &num_entries, max_entries, max_size, &ctr); loop_count++; @@ -885,7 +885,7 @@ static int rpc_group_usage(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -895,7 +895,7 @@ static int rpc_group_usage(int argc, const char **argv) **/ static NTSTATUS -rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_group_list_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol; @@ -908,7 +908,7 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, /* Get sam policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; @@ -916,7 +916,7 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -928,7 +928,7 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, d_printf("\nGroup name Comment"\ "\n-----------------------------\n"); do { - result = cli_samr_enum_dom_groups(cli, mem_ctx, &domain_pol, + result = smbcli_samr_enum_dom_groups(cli, mem_ctx, &domain_pol, &start_idx, max_entries, &groups, &num_entries); @@ -943,7 +943,7 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, } while (!NT_STATUS_IS_OK(result)); /* query domain aliases */ do { - result = cli_samr_enum_als_groups(cli, mem_ctx, &domain_pol, + result = smbcli_samr_enum_als_groups(cli, mem_ctx, &domain_pol, &start_idx, max_entries, &groups, &num_entries); @@ -956,10 +956,10 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, printf("%-21.21s\n", groups[i].acct_name); } } while (!NT_STATUS_IS_OK(result)); - cli_samr_close(cli, mem_ctx, &domain_pol); + smbcli_samr_close(cli, mem_ctx, &domain_pol); /* Get builtin policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, &global_sid_Builtin, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -967,7 +967,7 @@ rpc_group_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, } /* query builtin aliases */ do { - result = cli_samr_enum_als_groups(cli, mem_ctx, &domain_pol, + result = smbcli_samr_enum_als_groups(cli, mem_ctx, &domain_pol, &start_idx, max_entries, &groups, &num_entries); @@ -1028,7 +1028,7 @@ static int rpc_share_usage(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1037,7 +1037,7 @@ static int rpc_share_usage(int argc, const char **argv) * @return Normal NTSTATUS return. **/ static NTSTATUS -rpc_share_add_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_share_add_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx,int argc, const char **argv) { WERROR result; @@ -1052,7 +1052,7 @@ rpc_share_add_internals(const DOM_SID *domain_sid, struct cli_state *cli, return NT_STATUS_UNSUCCESSFUL; *path++ = '\0'; - result = cli_srvsvc_net_share_add(cli, mem_ctx, sharename, type, + result = smbcli_srvsvc_net_share_add(cli, mem_ctx, sharename, type, opt_comment, perms, opt_maxusers, num_users, path, password); return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; @@ -1076,7 +1076,7 @@ static int rpc_share_add(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1085,12 +1085,12 @@ static int rpc_share_add(int argc, const char **argv) * @return Normal NTSTATUS return. **/ static NTSTATUS -rpc_share_del_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_share_del_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx,int argc, const char **argv) { WERROR result; - result = cli_srvsvc_net_share_del(cli, mem_ctx, argv[0]); + result = smbcli_srvsvc_net_share_del(cli, mem_ctx, argv[0]); return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } @@ -1144,7 +1144,7 @@ static void display_share_info_1(SRV_SHARE_INFO_1 *info1) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1154,7 +1154,7 @@ static void display_share_info_1(SRV_SHARE_INFO_1 *info1) **/ static NTSTATUS -rpc_share_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_share_list_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { SRV_SHARE_INFO_CTR ctr; @@ -1164,7 +1164,7 @@ rpc_share_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, init_enum_hnd(&hnd, 0); - result = cli_srvsvc_net_share_enum( + result = smbcli_srvsvc_net_share_enum( cli, mem_ctx, 1, &ctr, preferred_len, &hnd); if (!W_ERROR_IS_OK(result)) @@ -1221,7 +1221,7 @@ static int rpc_file_usage(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1230,11 +1230,11 @@ static int rpc_file_usage(int argc, const char **argv) * @return Normal NTSTATUS return. **/ static NTSTATUS -rpc_file_close_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_file_close_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { WERROR result; - result = cli_srvsvc_net_file_close(cli, mem_ctx, atoi(argv[0])); + result = smbcli_srvsvc_net_file_close(cli, mem_ctx, atoi(argv[0])); return W_ERROR_IS_OK(result) ? NT_STATUS_OK : NT_STATUS_UNSUCCESSFUL; } @@ -1284,7 +1284,7 @@ static void display_file_info_3(FILE_INFO_3 *info3, FILE_INFO_3_STR *str3) * argc, argv which are passes through. * * @param domain_sid The domain sid acquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1294,7 +1294,7 @@ static void display_file_info_3(FILE_INFO_3 *info3, FILE_INFO_3_STR *str3) **/ static NTSTATUS -rpc_file_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, +rpc_file_list_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { SRV_FILE_INFO_CTR ctr; @@ -1309,7 +1309,7 @@ rpc_file_list_internals(const DOM_SID *domain_sid, struct cli_state *cli, if (argc > 0) username = smb_xstrdup(argv[0]); - result = cli_srvsvc_net_file_enum( + result = smbcli_srvsvc_net_file_enum( cli, mem_ctx, 3, username, &ctr, preferred_len, &hnd); if (!W_ERROR_IS_OK(result)) @@ -1388,7 +1388,7 @@ int net_rpc_file(int argc, const char **argv) * argc, argv which are passed through. * * @param domain_sid The domain sid aquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on compleation of the function. * @param argc Standard main() style argc * @param argv Standard main() style argv. Initial components are already @@ -1397,12 +1397,12 @@ int net_rpc_file(int argc, const char **argv) * @return Normal NTSTATUS return. **/ -static NTSTATUS rpc_shutdown_abort_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_shutdown_abort_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - result = cli_reg_abort_shutdown(cli, mem_ctx); + result = smbcli_reg_abort_shutdown(cli, mem_ctx); if (NT_STATUS_IS_OK(result)) DEBUG(5,("cmd_reg_abort_shutdown: query succeeded\n")); @@ -1436,7 +1436,7 @@ static int rpc_shutdown_abort(int argc, const char **argv) * argc, argv which are passes through. * * @param domain_sid The domain sid aquired from the remote server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on compleation of the function. * @param argc Standard main() style argc * @param argc Standard main() style argv. Initial components are already @@ -1445,7 +1445,7 @@ static int rpc_shutdown_abort(int argc, const char **argv) * @return Normal NTSTATUS return. **/ -static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { NTSTATUS result = NT_STATUS_UNSUCCESSFUL; @@ -1484,7 +1484,7 @@ static NTSTATUS rpc_shutdown_internals(const DOM_SID *domain_sid, struct cli_sta } /* create an entry */ - result = cli_reg_shutdown(cli, mem_ctx, msg, timeout, opt_reboot, opt_force); + result = smbcli_reg_shutdown(cli, mem_ctx, msg, timeout, opt_reboot, opt_force); if (NT_STATUS_IS_OK(result)) DEBUG(5,("Shutdown of remote machine succeeded\n")); @@ -1521,7 +1521,7 @@ static int rpc_shutdown(int argc, const char **argv) * function. * * @param domain_sid The domain sid acquired from the server - * @param cli A cli_state connected to the server. + * @param cli A smbcli_state connected to the server. * @param mem_ctx Talloc context, destoyed on completion of the function. * @param argc Standard main() style argc * @param argc Standard main() style argv. Initial components are already @@ -1530,7 +1530,7 @@ static int rpc_shutdown(int argc, const char **argv) * @return normal NTSTATUS return code */ -static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { POLICY_HND connect_pol, domain_pol, user_pol; @@ -1555,14 +1555,14 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, struct cli strupper(acct_name); /* Get samr policy handle */ - result = cli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, + result = smbcli_samr_connect(cli, mem_ctx, MAXIMUM_ALLOWED_ACCESS, &connect_pol); if (!NT_STATUS_IS_OK(result)) { goto done; } /* Get domain policy handle */ - result = cli_samr_open_domain(cli, mem_ctx, &connect_pol, + result = smbcli_samr_open_domain(cli, mem_ctx, &connect_pol, MAXIMUM_ALLOWED_ACCESS, domain_sid, &domain_pol); if (!NT_STATUS_IS_OK(result)) { @@ -1574,7 +1574,7 @@ static NTSTATUS rpc_trustdom_add_internals(const DOM_SID *domain_sid, struct cli unknown = 0xe005000b; /* No idea what this is - a permission mask? mimir: yes, most probably it is */ - result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol, + result = smbcli_samr_create_dom_user(cli, mem_ctx, &domain_pol, acct_name, acb_info, unknown, &user_pol, &user_rid); if (!NT_STATUS_IS_OK(result)) { @@ -1630,7 +1630,7 @@ static int rpc_trustdom_del(int argc, const char **argv) static int rpc_trustdom_establish(int argc, const char **argv) { - struct cli_state *cli; + struct smbcli_state *cli; struct in_addr server_ip; POLICY_HND connect_hnd; TALLOC_CTX *mem_ctx; @@ -1699,7 +1699,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) * Use NetServerEnum2 to make sure we're talking to a proper server */ - if (!cli_get_pdc_name(cli, domain_name, (char*)pdc_name)) { + if (!smbcli_get_pdc_name(cli, domain_name, (char*)pdc_name)) { DEBUG(0, ("NetServerEnum2 error: Couldn't find primary domain controller\ for domain %s\n", domain_name)); } @@ -1709,7 +1709,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) * note: It is now used only to get unicode domain name */ - if (!cli_nt_session_open(cli, PI_WKSSVC)) { + if (!smbcli_nt_session_open(cli, PI_WKSSVC)) { DEBUG(0, ("Couldn't not initialise wkssvc pipe\n")); return -1; } @@ -1717,11 +1717,11 @@ static int rpc_trustdom_establish(int argc, const char **argv) if (!(mem_ctx = talloc_init("establishing trust relationship to domain %s", domain_name))) { DEBUG(0, ("talloc_init() failed\n")); - cli_shutdown(cli); + smbcli_shutdown(cli); return -1; } - nt_status = cli_wks_query_info(cli, mem_ctx, &wks_info); + nt_status = smbcli_wks_query_info(cli, mem_ctx, &wks_info); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("WksQueryInfo call failed.\n")); @@ -1729,7 +1729,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) } if (cli->nt_pipe_fnum) - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); /* @@ -1738,17 +1738,17 @@ static int rpc_trustdom_establish(int argc, const char **argv) if (!(mem_ctx = talloc_init("rpc_trustdom_establish"))) { DEBUG(0, ("talloc_init() failed\n")); - cli_shutdown(cli); + smbcli_shutdown(cli); return -1; } - if (!cli_nt_session_open(cli, PI_LSARPC)) { + if (!smbcli_nt_session_open(cli, PI_LSARPC)) { DEBUG(0, ("Could not initialise lsa pipe\n")); - cli_shutdown(cli); + smbcli_shutdown(cli); return -1; } - nt_status = cli_lsa_open_policy2(cli, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, + nt_status = smbcli_lsa_open_policy2(cli, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, &connect_hnd); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("Couldn't open policy handle. Error was %s\n", @@ -1758,7 +1758,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) /* Querying info level 5 */ - nt_status = cli_lsa_query_info_policy(cli, mem_ctx, &connect_hnd, + nt_status = smbcli_lsa_query_info_policy(cli, mem_ctx, &connect_hnd, 5 /* info level */, domain_name, &domain_sid); if (NT_STATUS_IS_ERR(nt_status)) { @@ -1788,7 +1788,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) * Close the pipes and clean up */ - nt_status = cli_lsa_close(cli, mem_ctx, &connect_hnd); + nt_status = smbcli_lsa_close(cli, 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))); @@ -1796,7 +1796,7 @@ static int rpc_trustdom_establish(int argc, const char **argv) } if (cli->nt_pipe_fnum) - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); talloc_destroy(mem_ctx); @@ -1853,7 +1853,7 @@ static int rpc_trustdom_usage(int argc, const char **argv) } -static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, struct cli_state *cli, TALLOC_CTX *mem_ctx, +static NTSTATUS rpc_query_domain_sid(const DOM_SID *domain_sid, struct smbcli_state *cli, TALLOC_CTX *mem_ctx, int argc, const char **argv) { fstring str_sid; @@ -1867,7 +1867,7 @@ static int rpc_trustdom_list(int argc, const char **argv) { /* common variables */ TALLOC_CTX* mem_ctx; - struct cli_state *cli, *remote_cli; + struct smbcli_state *cli, *remote_cli; NTSTATUS nt_status; const char *domain_name = NULL; DOM_SID queried_dom_sid; @@ -1913,12 +1913,12 @@ static int rpc_trustdom_list(int argc, const char **argv) return -1; }; - if (!cli_nt_session_open(cli, PI_LSARPC)) { + if (!smbcli_nt_session_open(cli, PI_LSARPC)) { DEBUG(0, ("Could not initialise lsa pipe\n")); return -1; }; - nt_status = cli_lsa_open_policy2(cli, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, + nt_status = smbcli_lsa_open_policy2(cli, mem_ctx, True, SEC_RIGHTS_QUERY_VALUE, &connect_hnd); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("Couldn't open policy handle. Error was %s\n", @@ -1927,7 +1927,7 @@ static int rpc_trustdom_list(int argc, const char **argv) }; /* query info level 5 to obtain sid of a domain being queried */ - nt_status = cli_lsa_query_info_policy(cli, mem_ctx, &connect_hnd, + nt_status = smbcli_lsa_query_info_policy(cli, mem_ctx, &connect_hnd, 5 /* info level */, domain_name, &queried_dom_sid); if (NT_STATUS_IS_ERR(nt_status)) { DEBUG(0, ("LSA Query Info failed. Returned error was %s\n", @@ -1943,7 +1943,7 @@ static int rpc_trustdom_list(int argc, const char **argv) d_printf("Trusted domains list:\n\n"); do { - nt_status = cli_lsa_enum_trust_dom(cli, mem_ctx, &connect_hnd, &enum_ctx, + nt_status = smbcli_lsa_enum_trust_dom(cli, mem_ctx, &connect_hnd, &enum_ctx, &num_domains, &trusted_dom_names, &domain_sids); @@ -1974,14 +1974,14 @@ 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 = cli_lsa_close(cli, mem_ctx, &connect_hnd); + nt_status = smbcli_lsa_close(cli, 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))); return -1; }; - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); /* * Listing trusting domains (stored in passdb backend, if local) @@ -1992,13 +1992,13 @@ static int rpc_trustdom_list(int argc, const char **argv) /* * Open \PIPE\samr and get needed policy handles */ - if (!cli_nt_session_open(cli, PI_SAMR)) { + if (!smbcli_nt_session_open(cli, PI_SAMR)) { DEBUG(0, ("Could not initialise samr pipe\n")); return -1; }; /* SamrConnect */ - nt_status = cli_samr_connect(cli, mem_ctx, SA_RIGHT_SAM_OPEN_DOMAIN, + nt_status = smbcli_samr_connect(cli, mem_ctx, SA_RIGHT_SAM_OPEN_DOMAIN, &connect_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Couldn't open SAMR policy handle. Error was %s\n", @@ -2008,7 +2008,7 @@ static int rpc_trustdom_list(int argc, const char **argv) /* SamrOpenDomain - we have to open domain policy handle in order to be able to enumerate accounts*/ - nt_status = cli_samr_open_domain(cli, mem_ctx, &connect_hnd, + nt_status = smbcli_samr_open_domain(cli, mem_ctx, &connect_hnd, SA_RIGHT_DOMAIN_ENUM_ACCOUNTS, &queried_dom_sid, &domain_hnd); if (!NT_STATUS_IS_OK(nt_status)) { @@ -2024,7 +2024,7 @@ static int rpc_trustdom_list(int argc, const char **argv) enum_ctx = 0; /* reset enumeration context from last enumeration */ do { - nt_status = cli_samr_enum_dom_users(cli, mem_ctx, &domain_hnd, + nt_status = smbcli_samr_enum_dom_users(cli, mem_ctx, &domain_hnd, &enum_ctx, ACB_DOMTRUST, 0xffff, &trusting_dom_names, &trusting_dom_rids, &num_domains); @@ -2066,7 +2066,7 @@ static int rpc_trustdom_list(int argc, const char **argv) if (run_rpc_command(remote_cli, PI_LSARPC, 0, rpc_query_domain_sid, argc, argv)) d_printf("couldn't get domain's sid\n"); - cli_shutdown(remote_cli); + smbcli_shutdown(remote_cli); } else { d_printf("domain controller is not responding\n"); @@ -2078,19 +2078,19 @@ static int rpc_trustdom_list(int argc, const char **argv) } while (NT_STATUS_EQUAL(nt_status, STATUS_MORE_ENTRIES)); /* close opened samr and domain policy handles */ - nt_status = cli_samr_close(cli, mem_ctx, &domain_hnd); + nt_status = smbcli_samr_close(cli, mem_ctx, &domain_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Couldn't properly close domain policy handle for domain %s\n", domain_name)); }; - nt_status = cli_samr_close(cli, mem_ctx, &connect_hnd); + nt_status = smbcli_samr_close(cli, mem_ctx, &connect_hnd); if (!NT_STATUS_IS_OK(nt_status)) { DEBUG(0, ("Couldn't properly close samr policy handle for domain %s\n", domain_name)); }; /* close samr pipe and connection to IPC$ */ - cli_nt_session_close(cli); - cli_shutdown(cli); + smbcli_nt_session_close(cli); + smbcli_shutdown(cli); talloc_destroy(mem_ctx); return 0; @@ -2133,7 +2133,7 @@ static int rpc_trustdom(int argc, const char **argv) */ BOOL net_rpc_check(uint_t flags) { - struct cli_state cli; + struct smbcli_state cli; BOOL ret = False; struct in_addr server_ip; char *server_name = NULL; @@ -2143,22 +2143,22 @@ BOOL net_rpc_check(uint_t flags) return False; ZERO_STRUCT(cli); - if (cli_initialise(&cli) == False) + if (smbcli_initialise(&cli) == False) return False; - if (!cli_connect(&cli, server_name, &server_ip)) + if (!smbcli_connect(&cli, server_name, &server_ip)) goto done; if (!attempt_netbios_session_request(&cli, lp_netbios_name(), server_name, &server_ip)) goto done; - if (!cli_negprot(&cli)) + if (!smbcli_negprot(&cli)) goto done; if (cli.protocol < PROTOCOL_NT1) goto done; ret = True; done: - cli_shutdown(&cli); + smbcli_shutdown(&cli); return ret; } diff --git a/source4/utils/net_rpc_join.c b/source4/utils/net_rpc_join.c index 43bd56d251..9f915550af 100644 --- a/source4/utils/net_rpc_join.c +++ b/source4/utils/net_rpc_join.c @@ -44,7 +44,7 @@ **/ int net_rpc_join_ok(const char *domain) { - struct cli_state *cli; + struct smbcli_state *cli; uint8_t stored_md4_trust_password[16]; int retval = 1; uint32_t channel; @@ -56,7 +56,7 @@ int net_rpc_join_ok(const char *domain) return 1; } - if (!cli_nt_session_open(cli, PI_NETLOGON)) { + if (!smbcli_nt_session_open(cli, PI_NETLOGON)) { DEBUG(0,("Error connecting to NETLOGON pipe\n")); goto done; } @@ -74,7 +74,7 @@ int net_rpc_join_ok(const char *domain) channel = SEC_CHAN_WKSTA; } - CHECK_RPC_ERR(cli_nt_setup_creds(cli, + CHECK_RPC_ERR(smbcli_nt_setup_creds(cli, channel, stored_md4_trust_password, &neg_flags, 2), "error in domain join verification"); @@ -84,9 +84,9 @@ int net_rpc_join_ok(const char *domain) done: /* Close down pipe - this will clean up open policy handles */ if (cli->nt_pipe_fnum) - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); - cli_shutdown(cli); + smbcli_shutdown(cli); return retval; } @@ -106,7 +106,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* libsmb variables */ - struct cli_state *cli; + struct smbcli_state *cli; TALLOC_CTX *mem_ctx; uint32_t acb_info; @@ -148,38 +148,38 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* Fetch domain sid */ - if (!cli_nt_session_open(cli, PI_LSARPC)) { + if (!smbcli_nt_session_open(cli, PI_LSARPC)) { DEBUG(0, ("Error connecting to SAM pipe\n")); goto done; } - CHECK_RPC_ERR(cli_lsa_open_policy(cli, mem_ctx, True, + CHECK_RPC_ERR(smbcli_lsa_open_policy(cli, mem_ctx, True, SEC_RIGHTS_MAXIMUM_ALLOWED, &lsa_pol), "error opening lsa policy handle"); - CHECK_RPC_ERR(cli_lsa_query_info_policy(cli, mem_ctx, &lsa_pol, + CHECK_RPC_ERR(smbcli_lsa_query_info_policy(cli, mem_ctx, &lsa_pol, 5, domain, &domain_sid), "error querying info policy"); - cli_lsa_close(cli, mem_ctx, &lsa_pol); + smbcli_lsa_close(cli, mem_ctx, &lsa_pol); - cli_nt_session_close(cli); /* Done with this pipe */ + smbcli_nt_session_close(cli); /* Done with this pipe */ /* Create domain user */ - if (!cli_nt_session_open(cli, PI_SAMR)) { + if (!smbcli_nt_session_open(cli, PI_SAMR)) { DEBUG(0, ("Error connecting to SAM pipe\n")); goto done; } - CHECK_RPC_ERR(cli_samr_connect(cli, mem_ctx, + CHECK_RPC_ERR(smbcli_samr_connect(cli, mem_ctx, SEC_RIGHTS_MAXIMUM_ALLOWED, &sam_pol), "could not connect to SAM database"); - CHECK_RPC_ERR(cli_samr_open_domain(cli, mem_ctx, &sam_pol, + CHECK_RPC_ERR(smbcli_samr_open_domain(cli, mem_ctx, &sam_pol, SEC_RIGHTS_MAXIMUM_ALLOWED, &domain_sid, &domain_pol), "could not open domain"); @@ -191,7 +191,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) acb_info = ((lp_server_role() == ROLE_DOMAIN_BDC) || lp_server_role() == ROLE_DOMAIN_PDC) ? ACB_SVRTRUST : ACB_WSTRUST; - result = cli_samr_create_dom_user(cli, mem_ctx, &domain_pol, + result = smbcli_samr_create_dom_user(cli, mem_ctx, &domain_pol, acct_name, acb_info, 0xe005000b, &user_pol, &user_rid); @@ -213,9 +213,9 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* We *must* do this.... don't ask... */ if (NT_STATUS_IS_OK(result)) - cli_samr_close(cli, mem_ctx, &user_pol); + smbcli_samr_close(cli, mem_ctx, &user_pol); - CHECK_RPC_ERR_DEBUG(cli_samr_lookup_names(cli, mem_ctx, + CHECK_RPC_ERR_DEBUG(smbcli_samr_lookup_names(cli, mem_ctx, &domain_pol, flags, 1, &const_acct_name, &num_rids, @@ -233,7 +233,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* Open handle on user */ CHECK_RPC_ERR_DEBUG( - cli_samr_open_user(cli, mem_ctx, &domain_pol, + smbcli_samr_open_user(cli, mem_ctx, &domain_pol, SEC_RIGHTS_MAXIMUM_ALLOWED, user_rid, &user_pol), ("could not re-open existing user %s: %s\n", @@ -264,7 +264,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) ctr.switch_value = 24; ctr.info.id24 = &p24; - CHECK_RPC_ERR(cli_samr_set_userinfo(cli, mem_ctx, &user_pol, 24, + CHECK_RPC_ERR(smbcli_samr_set_userinfo(cli, mem_ctx, &user_pol, 24, cli->user_session_key, &ctr), "error setting trust account password"); @@ -286,7 +286,7 @@ int net_rpc_join_newstyle(int argc, const char **argv) /* Ignoring the return value is necessary for joining a domain as a normal user with "Add workstation to domain" privilege. */ - result = cli_samr_set_userinfo2(cli, mem_ctx, &user_pol, 0x10, + result = smbcli_samr_set_userinfo2(cli, mem_ctx, &user_pol, 0x10, sess_key, &ctr); /* Now store the secret in the secrets database */ @@ -303,8 +303,8 @@ int net_rpc_join_newstyle(int argc, const char **argv) } /* Now check the whole process from top-to-bottom */ - cli_samr_close(cli, mem_ctx, &user_pol); - cli_nt_session_close(cli); /* Done with this pipe */ + smbcli_samr_close(cli, mem_ctx, &user_pol); + smbcli_nt_session_close(cli); /* Done with this pipe */ retval = net_rpc_join_ok(domain); @@ -312,7 +312,7 @@ done: /* Close down pipe - this will clean up open policy handles */ if (cli->nt_pipe_fnum) - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); /* Display success or failure */ @@ -323,7 +323,7 @@ done: printf("Joined domain %s.\n",domain); } - cli_shutdown(cli); + smbcli_shutdown(cli); SAFE_FREE(clear_trust_password); diff --git a/source4/utils/net_rpc_samsync.c b/source4/utils/net_rpc_samsync.c index 3a6b754f37..1b0cbc6c76 100644 --- a/source4/utils/net_rpc_samsync.c +++ b/source4/utils/net_rpc_samsync.c @@ -118,7 +118,7 @@ static void display_sam_entry(SAM_DELTA_HDR *hdr_delta, SAM_DELTA_CTR *delta) } -static void dump_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_creds) +static void dump_database(struct smbcli_state *cli, uint_t db_type, DOM_CRED *ret_creds) { uint_t sync_context = 0; NTSTATUS result; @@ -135,7 +135,7 @@ static void dump_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_c d_printf("Dumping database %u\n", db_type); do { - result = cli_netlogon_sam_sync(cli, mem_ctx, ret_creds, db_type, + result = smbcli_netlogon_sam_sync(cli, mem_ctx, ret_creds, db_type, sync_context, &num_deltas, &hdr_deltas, &deltas); clnt_deal_with_creds(cli->sess_key, &(cli->clnt_cred), ret_creds); @@ -152,7 +152,7 @@ static void dump_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_c int rpc_samdump(int argc, const char **argv) { NTSTATUS result; - struct cli_state *cli = NULL; + struct smbcli_state *cli = NULL; uint8_t trust_password[16]; DOM_CRED ret_creds; uint32_t neg_flags = 0x000001ff; @@ -165,7 +165,7 @@ int rpc_samdump(int argc, const char **argv) return 1; } - if (!cli_nt_session_open(cli, PI_NETLOGON)) { + if (!smbcli_nt_session_open(cli, PI_NETLOGON)) { DEBUG(0,("Error connecting to NETLOGON pipe\n")); goto fail; } @@ -175,7 +175,7 @@ int rpc_samdump(int argc, const char **argv) goto fail; } - result = cli_nt_setup_creds(cli, SEC_CHAN_BDC, trust_password, &neg_flags, 2); + result = smbcli_nt_setup_creds(cli, SEC_CHAN_BDC, trust_password, &neg_flags, 2); if (!NT_STATUS_IS_OK(result)) { d_printf("Failed to setup BDC creds\n"); goto fail; @@ -185,13 +185,13 @@ int rpc_samdump(int argc, const char **argv) dump_database(cli, SAM_DATABASE_BUILTIN, &ret_creds); dump_database(cli, SAM_DATABASE_PRIVS, &ret_creds); - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); return 0; fail: if (cli) { - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); } return -1; } @@ -635,7 +635,7 @@ fetch_sam_entry(SAM_DELTA_HDR *hdr_delta, SAM_DELTA_CTR *delta, } static void -fetch_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_creds, +fetch_database(struct smbcli_state *cli, uint_t db_type, DOM_CRED *ret_creds, DOM_SID dom_sid) { uint_t sync_context = 0; @@ -653,7 +653,7 @@ fetch_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_creds, d_printf("Fetching database %u\n", db_type); do { - result = cli_netlogon_sam_sync(cli, mem_ctx, ret_creds, + result = smbcli_netlogon_sam_sync(cli, mem_ctx, ret_creds, db_type, sync_context, &num_deltas, &hdr_deltas, &deltas); @@ -672,7 +672,7 @@ fetch_database(struct cli_state *cli, uint_t db_type, DOM_CRED *ret_creds, int rpc_vampire(int argc, const char **argv) { NTSTATUS result; - struct cli_state *cli = NULL; + struct smbcli_state *cli = NULL; uint8_t trust_password[16]; DOM_CRED ret_creds; uint32_t neg_flags = 0x000001ff; @@ -686,7 +686,7 @@ int rpc_vampire(int argc, const char **argv) return 1; } - if (!cli_nt_session_open(cli, PI_NETLOGON)) { + if (!smbcli_nt_session_open(cli, PI_NETLOGON)) { DEBUG(0,("Error connecting to NETLOGON pipe\n")); goto fail; } @@ -697,7 +697,7 @@ int rpc_vampire(int argc, const char **argv) goto fail; } - result = cli_nt_setup_creds(cli, SEC_CHAN_BDC, trust_password, + result = smbcli_nt_setup_creds(cli, SEC_CHAN_BDC, trust_password, &neg_flags, 2); if (!NT_STATUS_IS_OK(result)) { d_printf("Failed to setup BDC creds\n"); @@ -713,13 +713,13 @@ int rpc_vampire(int argc, const char **argv) /* Currently we crash on PRIVS somewhere in unmarshalling */ /* Dump_database(cli, SAM_DATABASE_PRIVS, &ret_creds); */ - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); return 0; fail: if (cli) { - cli_nt_session_close(cli); + smbcli_nt_session_close(cli); } return -1; } diff --git a/source4/utils/net_time.c b/source4/utils/net_time.c index 4e6ce2336d..f7220c9424 100644 --- a/source4/utils/net_time.c +++ b/source4/utils/net_time.c @@ -24,16 +24,16 @@ /* return the time on a server. This does not require any authentication */ -static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone) +static time_t smbcli_servertime(const char *host, struct in_addr *ip, int *zone) { struct nmb_name calling, called; time_t ret = 0; - struct cli_state *cli = NULL; + struct smbcli_state *cli = NULL; - cli = cli_initialise(NULL); + cli = smbcli_initialise(NULL); if (!cli) goto done; - if (!cli_connect(cli, host, ip)) { + if (!smbcli_connect(cli, host, ip)) { fprintf(stderr,"Can't contact server\n"); goto done; } @@ -45,11 +45,11 @@ static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone) make_nmb_name(&called, "*SMBSERVER", 0x20); } - if (!cli_session_request(cli, &calling, &called)) { + if (!smbcli_session_request(cli, &calling, &called)) { fprintf(stderr,"Session request failed\n"); goto done; } - if (!cli_negprot(cli)) { + if (!smbcli_negprot(cli)) { fprintf(stderr,"Protocol negotiation failed\n"); goto done; } @@ -58,14 +58,14 @@ static time_t cli_servertime(const char *host, struct in_addr *ip, int *zone) if (zone) *zone = cli->serverzone; done: - if (cli) cli_shutdown(cli); + if (cli) smbcli_shutdown(cli); return ret; } /* find the servers time on the opt_host host */ static time_t nettime(int *zone) { - return cli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, zone); + return smbcli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, zone); } /* return a time as a string ready to be passed to /bin/date */ @@ -172,7 +172,7 @@ int net_time(int argc, const char **argv) } /* default - print the time */ - t = cli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, NULL); + t = smbcli_servertime(opt_host, opt_have_ip? &opt_dest_ip : NULL, NULL); if (t == 0) return -1; d_printf("%s", ctime(&t)); -- cgit