summaryrefslogtreecommitdiff
path: root/source3/rpcclient
diff options
context:
space:
mode:
Diffstat (limited to 'source3/rpcclient')
-rw-r--r--source3/rpcclient/cmd_srvsvc.c65
-rw-r--r--source3/rpcclient/rpcclient.c2
2 files changed, 32 insertions, 35 deletions
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 2964d1b54b..063174a1d1 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -34,7 +34,6 @@ extern int DEBUGLEVEL;
#define DEBUG_TESTING
extern struct cli_state *smb_cli;
-extern int smb_tidx;
extern FILE* out_hnd;
@@ -53,11 +52,11 @@ void cmd_srv_query_info(struct client_info *info)
bzero(&ctr, sizeof(ctr));
- strcpy(dest_srv, "\\\\");
- strcat(dest_srv, info->dest_host);
+ fstrcpy(dest_srv, "\\\\");
+ fstrcat(dest_srv, info->dest_host);
strupper(dest_srv);
- if (next_token(NULL, tmp, NULL))
+ if (next_token(NULL, tmp, NULL, sizeof(tmp)-1))
{
info_level = strtoul(tmp, (char**)NULL, 10);
}
@@ -68,14 +67,14 @@ void cmd_srv_query_info(struct client_info *info)
DEBUG(5, ("cmd_srv_query_info: smb_cli->fd:%d\n", smb_cli->fd));
/* open LSARPC session. */
- res = res ? do_session_open(smb_cli, smb_tidx, PIPE_SRVSVC, &(info->dom.srvsvc_fnum)) : False;
+ res = res ? cli_nt_session_open(smb_cli, PIPE_SRVSVC, False) : False;
/* send info level: receive requested info. hopefully. */
- res = res ? do_srv_net_srv_get_info(smb_cli, smb_tidx, info->dom.srvsvc_fnum,
+ res = res ? do_srv_net_srv_get_info(smb_cli,
dest_srv, info_level, &ctr) : False;
/* close the session */
- do_session_close(smb_cli, smb_tidx, info->dom.srvsvc_fnum);
+ cli_nt_session_close(smb_cli);
if (res)
{
@@ -107,15 +106,15 @@ void cmd_srv_enum_conn(struct client_info *info)
bzero(&ctr, sizeof(ctr));
- strcpy(qual_srv, "\\\\");
- strcat(qual_srv, info->myhostname);
+ fstrcpy(qual_srv, "\\\\");
+ fstrcat(qual_srv, info->myhostname);
strupper(qual_srv);
- strcpy(dest_srv, "\\\\");
- strcat(dest_srv, info->dest_host);
+ fstrcpy(dest_srv, "\\\\");
+ fstrcat(dest_srv, info->dest_host);
strupper(dest_srv);
- if (next_token(NULL, tmp, NULL))
+ if (next_token(NULL, tmp, NULL, sizeof(tmp)-1))
{
info_level = strtoul(tmp, (char**)NULL, 10);
}
@@ -126,13 +125,13 @@ void cmd_srv_enum_conn(struct client_info *info)
DEBUG(5, ("cmd_srv_enum_conn: smb_cli->fd:%d\n", smb_cli->fd));
/* open srvsvc session. */
- res = res ? do_session_open(smb_cli, smb_tidx, PIPE_SRVSVC, &(info->dom.srvsvc_fnum)) : False;
+ res = res ? cli_nt_session_open(smb_cli, PIPE_SRVSVC, False) : False;
hnd.ptr_hnd = 1;
hnd.handle = 0;
/* enumerate connections on server */
- res = res ? do_srv_net_srv_conn_enum(smb_cli, smb_tidx, info->dom.srvsvc_fnum,
+ res = res ? do_srv_net_srv_conn_enum(smb_cli,
dest_srv, qual_srv,
info_level, &ctr, 0xffffffff, &hnd) : False;
@@ -144,7 +143,7 @@ void cmd_srv_enum_conn(struct client_info *info)
}
/* close the session */
- do_session_close(smb_cli, smb_tidx, info->dom.srvsvc_fnum);
+ cli_nt_session_close(smb_cli);
if (res)
{
@@ -171,11 +170,11 @@ void cmd_srv_enum_shares(struct client_info *info)
bzero(&ctr, sizeof(ctr));
- strcpy(dest_srv, "\\\\");
- strcat(dest_srv, info->dest_host);
+ fstrcpy(dest_srv, "\\\\");
+ fstrcat(dest_srv, info->dest_host);
strupper(dest_srv);
- if (next_token(NULL, tmp, NULL))
+ if (next_token(NULL, tmp, NULL, sizeof(tmp)-1))
{
info_level = strtoul(tmp, (char**)NULL, 10);
}
@@ -186,13 +185,13 @@ void cmd_srv_enum_shares(struct client_info *info)
DEBUG(5, ("cmd_srv_enum_shares: smb_cli->fd:%d\n", smb_cli->fd));
/* open srvsvc session. */
- res = res ? do_session_open(smb_cli, smb_tidx, PIPE_SRVSVC, &(info->dom.srvsvc_fnum)) : False;
+ res = res ? cli_nt_session_open(smb_cli, PIPE_SRVSVC, False) : False;
hnd.ptr_hnd = 0;
hnd.handle = 0;
/* enumerate shares_files on server */
- res = res ? do_srv_net_srv_share_enum(smb_cli, smb_tidx, info->dom.srvsvc_fnum,
+ res = res ? do_srv_net_srv_share_enum(smb_cli,
dest_srv,
info_level, &ctr, 0xffffffff, &hnd) : False;
@@ -204,7 +203,7 @@ void cmd_srv_enum_shares(struct client_info *info)
}
/* close the session */
- do_session_close(smb_cli, smb_tidx, info->dom.srvsvc_fnum);
+ cli_nt_session_close(smb_cli);
if (res)
{
@@ -231,11 +230,11 @@ void cmd_srv_enum_sess(struct client_info *info)
bzero(&ctr, sizeof(ctr));
- strcpy(dest_srv, "\\\\");
- strcat(dest_srv, info->dest_host);
+ fstrcpy(dest_srv, "\\\\");
+ fstrcat(dest_srv, info->dest_host);
strupper(dest_srv);
- if (next_token(NULL, tmp, NULL))
+ if (next_token(NULL, tmp, NULL, sizeof(tmp)-1))
{
info_level = strtoul(tmp, (char**)NULL, 10);
}
@@ -246,17 +245,17 @@ void cmd_srv_enum_sess(struct client_info *info)
DEBUG(5, ("cmd_srv_enum_sess: smb_cli->fd:%d\n", smb_cli->fd));
/* open srvsvc session. */
- res = res ? do_session_open(smb_cli, smb_tidx, PIPE_SRVSVC, &(info->dom.srvsvc_fnum)) : False;
+ res = res ? cli_nt_session_open(smb_cli, PIPE_SRVSVC, False) : False;
hnd.ptr_hnd = 1;
hnd.handle = 0;
/* enumerate sessions on server */
- res = res ? do_srv_net_srv_sess_enum(smb_cli, smb_tidx, info->dom.srvsvc_fnum,
+ res = res ? do_srv_net_srv_sess_enum(smb_cli,
dest_srv, NULL, info_level, &ctr, 0x1000, &hnd) : False;
/* close the session */
- do_session_close(smb_cli, smb_tidx, info->dom.srvsvc_fnum);
+ cli_nt_session_close(smb_cli);
if (res)
{
@@ -283,11 +282,11 @@ void cmd_srv_enum_files(struct client_info *info)
bzero(&ctr, sizeof(ctr));
- strcpy(dest_srv, "\\\\");
- strcat(dest_srv, info->dest_host);
+ fstrcpy(dest_srv, "\\\\");
+ fstrcat(dest_srv, info->dest_host);
strupper(dest_srv);
- if (next_token(NULL, tmp, NULL))
+ if (next_token(NULL, tmp, NULL, sizeof(tmp)-1))
{
info_level = strtoul(tmp, (char**)NULL, 10);
}
@@ -298,13 +297,13 @@ void cmd_srv_enum_files(struct client_info *info)
DEBUG(5, ("cmd_srv_enum_files: smb_cli->fd:%d\n", smb_cli->fd));
/* open srvsvc session. */
- res = res ? do_session_open(smb_cli, smb_tidx, PIPE_SRVSVC, &(info->dom.srvsvc_fnum)) : False;
+ res = res ? cli_nt_session_open(smb_cli, PIPE_SRVSVC, False) : False;
hnd.ptr_hnd = 1;
hnd.handle = 0;
/* enumerate files on server */
- res = res ? do_srv_net_srv_file_enum(smb_cli, smb_tidx, info->dom.srvsvc_fnum,
+ res = res ? do_srv_net_srv_file_enum(smb_cli,
dest_srv, NULL, info_level, &ctr, 0x1000, &hnd) : False;
if (res)
@@ -315,7 +314,7 @@ void cmd_srv_enum_files(struct client_info *info)
}
/* close the session */
- do_session_close(smb_cli, smb_tidx, info->dom.srvsvc_fnum);
+ cli_nt_session_close(smb_cli);
if (res)
{
diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index 3dd53581aa..820d54e8b3 100644
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -107,13 +107,11 @@ struct
{"ntlogin", cmd_netlogon_login_test, "<username> NT Domain login test"},
#endif
{"wksinfo", cmd_wks_query_info, "DCE/RPC - Workstation Query Info"},
-#if 0
{"srvinfo", cmd_srv_query_info, "DCE/RPC - Server Query Info"},
{"srvsessions",cmd_srv_enum_sess, "DCE/RPC - List sessions on a server"},
{"srvshares", cmd_srv_enum_shares, "DCE/RPC - List shares on a server"},
{"srvconnections",cmd_srv_enum_conn, "DCE/RPC - List connections on a server"},
{"srvfiles", cmd_srv_enum_files, "DCE/RPC - List files on a server"},
-#endif
{"lsaquery", cmd_lsa_query_info, "Query Info Policy (domain member or server)"},
{"lookupsids", cmd_lsa_lookup_sids, "Resolve names from SIDs"},
{"enumusers", cmd_sam_enum_users, "SAM User Database Query (experimental!)"},
generated by cgit (git 2.34.1) at 2024-07-04 17:14:46 +0000