mirror of
https://github.com/samba-team/samba.git
synced 2025-08-02 00:22:11 +03:00
Makefile.in :
- added srvsvc client files clientgen.c : - replaced cli_error(cli, int *cls, int *err) with cli_error(cli, uint8 cls, uint32 *err). this version detects 32 bit status messages. the DOS error "MORE_DATA", the equivalent of the 32 bit *warning* 0x8000 0005 (STATUS_BUFFER_OVERFLOW), was being processed as an error, terminating the cli_receive_trans() call. cli_pipe.c : - replaced calls that had been incorrectly modified from 32 bit warnings (0x8000 0005 - STATUS_BUFFER_OVERFLOW) to 8 bit DOS errors (0x01 0xEA - MORE_DATA). the use of the old version of cli_error (DOS only) instead of the new one (DOS and 32 bit) caused the dce/rpc client code to fail. - replaced 2 space indentation with tab indentation in all functions. cli_srvsvc.c : cmd_srvsvc.c : - added these files back in, fixing them up to use jeremy's modified versions of the dce/rpc client functions. parse_srv.c : - added back in some "unused" functions required by dce/rpc client-side code. it would be helpful if all such "unused" functions could be added back in. rpcclient.c : - added "session", "file", "share", "connection" enumeration functions back in. these are equivalent to nt's "NetXXXXXEnum" Win32 (MSDN) functions. - added "srvinfo" function back in. this is equivalent to nt's NetServerGetInfo Win32 (MSDN) function.
This commit is contained in:
Luke Leighton
@ -111,9 +111,15 @@ RPC_PARSE_OBJ = rpc_parse/parse_lsa.o rpc_parse/parse_misc.o \
|
||||
rpc_parse/parse_samr.o rpc_parse/parse_srv.o \
|
||||
rpc_parse/parse_wks.o
|
||||
|
||||
RPC_CLIENT_OBJ = rpc_client/cli_login.o rpc_client/cli_netlogon.o \
|
||||
rpc_client/cli_pipe.o rpc_client/cli_lsarpc.o \
|
||||
rpc_client/cli_wkssvc.o rpc_client/cli_samr.o
|
||||
RPC_CLIENT_OBJ = \
|
||||
rpc_client/cli_login.o \
|
||||
rpc_client/cli_netlogon.o \
|
||||
rpc_client/cli_pipe.o \
|
||||
rpc_client/cli_lsarpc.o \
|
||||
rpc_client/cli_wkssvc.o \
|
||||
rpc_client/cli_srvsvc.o \
|
||||
rpc_client/cli_samr.o
|
||||
|
||||
|
||||
LOCKING_OBJ = locking/locking.o locking/locking_shm.o locking/locking_slow.o \
|
||||
locking/shmem.o locking/shmem_sysv.o
|
||||
|
||||
@ -403,7 +403,7 @@ BOOL cli_session_request(struct cli_state *cli,
|
||||
BOOL cli_connect(struct cli_state *cli, char *host, struct in_addr *ip);
|
||||
BOOL cli_initialise(struct cli_state *cli);
|
||||
void cli_shutdown(struct cli_state *cli);
|
||||
void cli_error(struct cli_state *cli, int *eclass, int *num);
|
||||
BOOL cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num);
|
||||
void cli_sockopt(struct cli_state *cli, char *options);
|
||||
uint16 cli_setpid(struct cli_state *cli, uint16 pid);
|
||||
BOOL cli_reestablish_connection(struct cli_state *cli);
|
||||
@ -1275,6 +1275,31 @@ BOOL do_samr_query_userinfo(struct cli_state *cli,
|
||||
POLICY_HND *pol, uint16 switch_value, void* usr);
|
||||
BOOL do_samr_close(struct cli_state *cli, POLICY_HND *hnd);
|
||||
|
||||
/*The following definitions come from rpc_client/cli_srvsvc.c */
|
||||
|
||||
BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_CONN_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_SESS_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
|
||||
char *server_name,
|
||||
uint32 switch_value, SRV_SHARE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_FILE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
BOOL do_srv_net_srv_get_info(struct cli_state *cli,
|
||||
char *server_name, uint32 switch_value, SRV_INFO_CTR *ctr);
|
||||
|
||||
/*The following definitions come from rpc_client/cli_wkssvc.c */
|
||||
|
||||
BOOL do_wks_query_info(struct cli_state *cli,
|
||||
@ -1668,6 +1693,11 @@ void make_srv_share_info2(SH_INFO_2 *sh2,
|
||||
char *net_name, uint32 type, char *remark,
|
||||
uint32 perms, uint32 max_uses, uint32 num_uses,
|
||||
char *path, char *passwd);
|
||||
void make_srv_q_net_share_enum(SRV_Q_NET_SHARE_ENUM *q_n,
|
||||
char *srv_name,
|
||||
uint32 share_level, SRV_SHARE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
void srv_io_q_net_share_enum(char *desc, SRV_Q_NET_SHARE_ENUM *q_n, prs_struct *ps, int depth);
|
||||
void srv_io_r_net_share_enum(char *desc, SRV_R_NET_SHARE_ENUM *r_n, prs_struct *ps, int depth);
|
||||
void make_srv_sess_info0_str(SESS_INFO_0_STR *ss0, char *name);
|
||||
@ -1677,6 +1707,11 @@ void make_srv_sess_info1(SESS_INFO_1 *ss1,
|
||||
char *name, char *user,
|
||||
uint32 num_opens, uint32 open_time, uint32 idle_time,
|
||||
uint32 user_flags);
|
||||
void make_srv_q_net_sess_enum(SRV_Q_NET_SESS_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 sess_level, SRV_SESS_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
void srv_io_q_net_sess_enum(char *desc, SRV_Q_NET_SESS_ENUM *q_n, prs_struct *ps, int depth);
|
||||
void srv_io_r_net_sess_enum(char *desc, SRV_R_NET_SESS_ENUM *r_n, prs_struct *ps, int depth);
|
||||
void make_srv_conn_info0(CONN_INFO_0 *ss0, uint32 id);
|
||||
@ -1685,12 +1720,22 @@ void make_srv_conn_info1(CONN_INFO_1 *ss1,
|
||||
uint32 id, uint32 type,
|
||||
uint32 num_opens, uint32 num_users, uint32 open_time,
|
||||
char *usr_name, char *net_name);
|
||||
void make_srv_q_net_conn_enum(SRV_Q_NET_CONN_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 conn_level, SRV_CONN_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
void srv_io_q_net_conn_enum(char *desc, SRV_Q_NET_CONN_ENUM *q_n, prs_struct *ps, int depth);
|
||||
void srv_io_r_net_conn_enum(char *desc, SRV_R_NET_CONN_ENUM *r_n, prs_struct *ps, int depth);
|
||||
void make_srv_file_info3_str(FILE_INFO_3_STR *fi3, char *user_name, char *path_name);
|
||||
void make_srv_file_info3(FILE_INFO_3 *fl3,
|
||||
uint32 id, uint32 perms, uint32 num_locks,
|
||||
char *path_name, char *user_name);
|
||||
void make_srv_q_net_file_enum(SRV_Q_NET_FILE_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 file_level, SRV_FILE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd);
|
||||
void srv_io_q_net_file_enum(char *desc, SRV_Q_NET_FILE_ENUM *q_n, prs_struct *ps, int depth);
|
||||
void srv_io_r_net_file_enum(char *desc, SRV_R_NET_FILE_ENUM *r_n, prs_struct *ps, int depth);
|
||||
void make_srv_info_101(SRV_INFO_101 *sv101, uint32 platform_id, char *name,
|
||||
@ -1701,6 +1746,8 @@ void make_srv_info_102(SRV_INFO_102 *sv102, uint32 platform_id, char *name,
|
||||
uint32 srv_type, uint32 users, uint32 disc, uint32 hidden,
|
||||
uint32 announce, uint32 ann_delta, uint32 licenses,
|
||||
char *usr_path);
|
||||
void make_srv_q_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *srv,
|
||||
char *server_name, uint32 switch_value);
|
||||
void srv_io_q_net_srv_get_info(char *desc, SRV_Q_NET_SRV_GET_INFO *q_n, prs_struct *ps, int depth);
|
||||
void make_srv_r_net_srv_get_info(SRV_R_NET_SRV_GET_INFO *srv,
|
||||
uint32 switch_value, SRV_INFO_CTR *ctr, uint32 status);
|
||||
|
||||
@ -64,8 +64,8 @@ static char *cli_smb_errstr(struct cli_state *cli)
|
||||
char *cli_errstr(struct cli_state *cli)
|
||||
{
|
||||
static fstring error_message;
|
||||
int errclass;
|
||||
int errnum;
|
||||
uint8 errclass;
|
||||
uint32 errnum;
|
||||
int i;
|
||||
|
||||
/*
|
||||
@ -76,20 +76,28 @@ char *cli_errstr(struct cli_state *cli)
|
||||
*/
|
||||
|
||||
cli_error(cli, &errclass, &errnum);
|
||||
|
||||
if (errclass != 0)
|
||||
{
|
||||
return cli_smb_errstr(cli);
|
||||
}
|
||||
|
||||
/*
|
||||
* Was it an NT error ?
|
||||
*/
|
||||
|
||||
if(cli->nt_error) {
|
||||
if (cli->nt_error)
|
||||
{
|
||||
char *nt_msg = get_nt_error_msg(cli->nt_error);
|
||||
|
||||
if (nt_msg == NULL)
|
||||
{
|
||||
slprintf(error_message, sizeof(fstring) - 1, "NT code %d", cli->nt_error);
|
||||
}
|
||||
else
|
||||
{
|
||||
fstrcpy(error_message, nt_msg);
|
||||
}
|
||||
|
||||
return error_message;
|
||||
}
|
||||
@ -100,8 +108,10 @@ char *cli_errstr(struct cli_state *cli)
|
||||
|
||||
slprintf(error_message, sizeof(error_message) - 1, "code %d", cli->rap_error);
|
||||
|
||||
for(i = 0; rap_errmap[i].message != NULL; i++) {
|
||||
if (rap_errmap[i].err == cli->rap_error) {
|
||||
for (i = 0; rap_errmap[i].message != NULL; i++)
|
||||
{
|
||||
if (rap_errmap[i].err == cli->rap_error)
|
||||
{
|
||||
fstrcpy( error_message, rap_errmap[i].message);
|
||||
break;
|
||||
}
|
||||
@ -262,8 +272,11 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
|
||||
CVAL(cli->inbuf,smb_com)));
|
||||
return(False);
|
||||
}
|
||||
if (CVAL(cli->inbuf,smb_rcls) != 0)
|
||||
|
||||
if (cli_error(cli, NULL, NULL))
|
||||
{
|
||||
return(False);
|
||||
}
|
||||
|
||||
/* parse out the lengths */
|
||||
total_data = SVAL(cli->inbuf,smb_tdrcnt);
|
||||
@ -313,9 +326,11 @@ static BOOL cli_receive_trans(struct cli_state *cli,int trans,
|
||||
CVAL(cli->inbuf,smb_com)));
|
||||
return(False);
|
||||
}
|
||||
if (CVAL(cli->inbuf,smb_rcls) != 0)
|
||||
if (cli_error(cli, NULL, NULL))
|
||||
{
|
||||
return(False);
|
||||
}
|
||||
}
|
||||
|
||||
return(True);
|
||||
}
|
||||
@ -620,7 +635,8 @@ BOOL cli_session_setup(struct cli_state *cli,
|
||||
/* send a session setup command */
|
||||
bzero(cli->outbuf,smb_size);
|
||||
|
||||
if (cli->protocol < PROTOCOL_NT1) {
|
||||
if (cli->protocol < PROTOCOL_NT1)
|
||||
{
|
||||
set_message(cli->outbuf,10,1 + strlen(user) + passlen,True);
|
||||
CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
|
||||
cli_setup_packet(cli);
|
||||
@ -636,7 +652,9 @@ BOOL cli_session_setup(struct cli_state *cli,
|
||||
p += passlen;
|
||||
pstrcpy(p,user);
|
||||
strupper(p);
|
||||
} else {
|
||||
}
|
||||
else
|
||||
{
|
||||
set_message(cli->outbuf,13,0,True);
|
||||
CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
|
||||
cli_setup_packet(cli);
|
||||
@ -648,11 +666,15 @@ BOOL cli_session_setup(struct cli_state *cli,
|
||||
SIVAL(cli->outbuf,smb_vwv5,cli->sesskey);
|
||||
SSVAL(cli->outbuf,smb_vwv7,passlen);
|
||||
SSVAL(cli->outbuf,smb_vwv8,ntpasslen);
|
||||
SSVAL(cli->outbuf,smb_vwv11,CAP_STATUS32);
|
||||
p = smb_buf(cli->outbuf);
|
||||
memcpy(p,pword,passlen);
|
||||
p += SVAL(cli->outbuf,smb_vwv7);
|
||||
if (ntpasslen != 0)
|
||||
{
|
||||
memcpy(p,ntpass,ntpasslen);
|
||||
p += SVAL(cli->outbuf,smb_vwv8);
|
||||
}
|
||||
pstrcpy(p,user);
|
||||
strupper(p);
|
||||
p = skip_string(p,1);
|
||||
@ -2007,13 +2029,37 @@ void cli_shutdown(struct cli_state *cli)
|
||||
memset(cli, 0, sizeof(*cli));
|
||||
}
|
||||
|
||||
|
||||
/****************************************************************************
|
||||
return error codes for the last packet
|
||||
****************************************************************************/
|
||||
void cli_error(struct cli_state *cli, int *eclass, int *num)
|
||||
BOOL cli_error(struct cli_state *cli, uint8 *eclass, uint32 *num)
|
||||
{
|
||||
*eclass = CVAL(cli->inbuf,smb_rcls);
|
||||
*num = SVAL(cli->inbuf,smb_err);
|
||||
int flgs2 = SVAL(cli->inbuf,smb_flg2);
|
||||
|
||||
if (eclass) *eclass = 0;
|
||||
if (num ) *num = 0;
|
||||
|
||||
if (flgs2 & FLAGS2_32_BIT_ERROR_CODES)
|
||||
{
|
||||
/* 32 bit error codes detected */
|
||||
uint32 nt_err = IVAL(cli->inbuf,smb_rcls);
|
||||
if (num) *num = nt_err;
|
||||
DEBUG(10,("cli_error: 32 bit codes: code=%08x\n", nt_err));
|
||||
return (IS_BITS_SET_ALL(nt_err, 0xc0000000));
|
||||
}
|
||||
else
|
||||
{
|
||||
/* dos 16 bit error codes detected */
|
||||
char rcls = CVAL(cli->inbuf,smb_rcls);
|
||||
if (rcls != 0)
|
||||
{
|
||||
if (eclass) *eclass = rcls;
|
||||
if (num ) *num = SVAL(cli->inbuf,smb_err);
|
||||
return True;
|
||||
}
|
||||
}
|
||||
return False;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
||||
@ -56,7 +56,6 @@ static BOOL rpc_read(struct cli_state *cli,
|
||||
int num_read;
|
||||
char *data = rdata->data->data;
|
||||
uint32 err;
|
||||
uint32 errclass;
|
||||
uint32 new_data_size = rdata->data->data_used + data_to_read;
|
||||
|
||||
data += rdata_offset;
|
||||
@ -94,9 +93,7 @@ static BOOL rpc_read(struct cli_state *cli,
|
||||
file_offset += num_read;
|
||||
data += num_read;
|
||||
|
||||
cli_error(cli, (int *)&errclass, (int *)&err);
|
||||
if (errclass != 0)
|
||||
return False;
|
||||
if (cli_error(cli, NULL, &err)) return False;
|
||||
|
||||
} while (num_read > 0 && data_to_read > 0);
|
||||
/* && err == (0x80000000 | STATUS_BUFFER_OVERFLOW)); */
|
||||
@ -164,7 +161,6 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
|
||||
uint16 setup[2]; /* only need 2 uint16 setup parameters */
|
||||
uint32 err;
|
||||
uint32 errclass;
|
||||
uint8 pkt_type = 0xff;
|
||||
BOOL first = True;
|
||||
BOOL last = True;
|
||||
@ -202,8 +198,7 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
return False;
|
||||
}
|
||||
|
||||
if (rdata->data->data == NULL)
|
||||
return False;
|
||||
if (rdata->data->data == NULL) return False;
|
||||
|
||||
/**** parse the header: check it's a response record */
|
||||
|
||||
@ -213,11 +208,9 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
|
||||
/* cli_api_pipe does an ordinary Realloc - we have no margins now. */
|
||||
rdata->data->margin = 0;
|
||||
if(rparam)
|
||||
rparam->data->margin = 0;
|
||||
if (rparam) rparam->data->margin = 0;
|
||||
|
||||
if (!rpc_check_hdr(rdata, &pkt_type, &first, &last, &len))
|
||||
return False;
|
||||
if (!rpc_check_hdr(rdata, &pkt_type, &first, &last, &len)) return False;
|
||||
|
||||
if (pkt_type == RPC_RESPONSE)
|
||||
{
|
||||
@ -233,8 +226,10 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
if (len > 0) /* || err == (0x80000000 | STATUS_BUFFER_OVERFLOW)) */
|
||||
{
|
||||
if (!rpc_read(cli, rdata, len, rdata->data->data_used))
|
||||
{
|
||||
return False;
|
||||
}
|
||||
}
|
||||
|
||||
/* only one rpc fragment, and it has been read */
|
||||
if (first && last)
|
||||
@ -255,17 +250,14 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
num_read = cli_read(cli, cli->nt_pipe_fnum, hps.data->data, 0, 0x18);
|
||||
DEBUG(5,("rpc_api_pipe: read header (size:%d)\n", num_read));
|
||||
|
||||
if (num_read != 0x18)
|
||||
return False;
|
||||
if (num_read != 0x18) return False;
|
||||
|
||||
smb_io_rpc_hdr ("rpc_hdr ", &rhdr , &hps, 0);
|
||||
smb_io_rpc_hdr_resp("rpc_hdr_resp", &rhdr_resp, &hps, 0);
|
||||
|
||||
prs_mem_free(&hps);
|
||||
|
||||
cli_error(cli, (int *)&errclass, (int *)&err);
|
||||
if (errclass != 0)
|
||||
return False;
|
||||
if (cli_error(cli, NULL, &err)) return False;
|
||||
|
||||
first = IS_BITS_SET_ALL(rhdr.flags, RPC_FLG_FIRST);
|
||||
last = IS_BITS_SET_ALL(rhdr.flags, RPC_FLG_LAST );
|
||||
@ -278,8 +270,10 @@ static BOOL rpc_api_pipe(struct cli_state *cli, uint16 cmd,
|
||||
|
||||
len = rhdr.frag_len - hps.offset;
|
||||
if (!rpc_read(cli, rdata, len, rdata->data->data_used))
|
||||
{
|
||||
return False;
|
||||
}
|
||||
}
|
||||
|
||||
return True;
|
||||
}
|
||||
@ -324,13 +318,13 @@ static BOOL create_rpc_bind_req(prs_struct *rhdr,
|
||||
|
||||
/* create the request RPC_HDR */
|
||||
make_rpc_hdr(&hdr, RPC_BIND, 0x0, get_rpc_call_id(),
|
||||
rhdr_rb->offset + 0x10, auth_req != NULL ? auth_req->offset : 0);
|
||||
rhdr_rb->offset + 0x10,
|
||||
auth_req != NULL ? auth_req->offset : 0);
|
||||
|
||||
smb_io_rpc_hdr("hdr" , &hdr , rhdr, 0);
|
||||
mem_realloc_data(rhdr->data, rhdr->offset);
|
||||
|
||||
if (rhdr->data == NULL || rhdr_rb->data == NULL)
|
||||
return False;
|
||||
if (rhdr->data == NULL || rhdr_rb->data == NULL) return False;
|
||||
|
||||
/***/
|
||||
/*** link rpc header, bind acknowledgment and authentication responses ***/
|
||||
@ -389,8 +383,7 @@ static BOOL create_rpc_request(prs_struct *rhdr, uint8 op_num, int data_len)
|
||||
smb_io_rpc_hdr ("hdr ", &hdr , rhdr, 0);
|
||||
smb_io_rpc_hdr_req("hdr_req", &hdr_req, rhdr, 0);
|
||||
|
||||
if (rhdr->data == NULL || rhdr->offset != 0x18)
|
||||
return False;
|
||||
if (rhdr->data == NULL || rhdr->offset != 0x18) return False;
|
||||
|
||||
rhdr->data->offset.start = 0;
|
||||
rhdr->data->offset.end = rhdr->offset;
|
||||
@ -445,8 +438,7 @@ static BOOL rpc_pipe_set_hnd_state(struct cli_state *cli, char *pipe_name, uint1
|
||||
char *rdata = NULL;
|
||||
uint32 rparam_len, rdata_len;
|
||||
|
||||
if (pipe_name == NULL)
|
||||
return False;
|
||||
if (pipe_name == NULL) return False;
|
||||
|
||||
DEBUG(5,("Set Handle state Pipe[%x]: %s - device state:%x\n",
|
||||
cli->nt_pipe_fnum, pipe_name, device_state));
|
||||
@ -470,10 +462,8 @@ static BOOL rpc_pipe_set_hnd_state(struct cli_state *cli, char *pipe_name, uint1
|
||||
state_set = True;
|
||||
}
|
||||
|
||||
if(rparam)
|
||||
free(rparam);
|
||||
if(rdata)
|
||||
free(rdata);
|
||||
if (rparam) free(rparam);
|
||||
if (rdata ) free(rdata );
|
||||
|
||||
return state_set;
|
||||
}
|
||||
@ -536,7 +526,8 @@ static BOOL check_bind_response(RPC_HDR_BA *hdr_ba, char *pipe_name, RPC_IFACE *
|
||||
else
|
||||
{
|
||||
DEBUG(2,("bind_rpc_pipe: pipe_name %s != expected pipe %s\n",
|
||||
pipe_names[i].server_pipe , hdr_ba->addr.str));
|
||||
pipe_names[i].server_pipe ,
|
||||
hdr_ba->addr.str));
|
||||
return False;
|
||||
}
|
||||
}
|
||||
@ -593,8 +584,7 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
|
||||
|
||||
DEBUG(5,("Bind RPC Pipe[%x]: %s\n", cli->nt_pipe_fnum, pipe_name));
|
||||
|
||||
if (!valid_pipe_name(pipe_name, abstract, transfer))
|
||||
return False;
|
||||
if (!valid_pipe_name(pipe_name, abstract, transfer)) return False;
|
||||
|
||||
prs_init(&hdr , 0x10 , 4, 0x0 , False);
|
||||
prs_init(&hdr_rb , 1024 , 4, SAFETY_MARGIN, False);
|
||||
@ -620,8 +610,10 @@ static BOOL rpc_pipe_bind(struct cli_state *cli, char *pipe_name,
|
||||
smb_io_rpc_hdr_ba("", &hdr_ba, &rdata, 0);
|
||||
|
||||
if (rdata.offset != 0)
|
||||
{
|
||||
valid_ack = check_bind_response(&hdr_ba, pipe_name, transfer);
|
||||
}
|
||||
}
|
||||
|
||||
prs_mem_free(&data );
|
||||
prs_mem_free(&hdr );
|
||||
@ -646,8 +638,8 @@ BOOL cli_nt_session_open(struct cli_state *cli, char *pipe_name, BOOL encrypted)
|
||||
/******************* open the pipe *****************/
|
||||
if ((fnum = cli_open(cli, pipe_name, O_CREAT|O_RDWR, DENY_NONE)) == -1)
|
||||
{
|
||||
DEBUG(0,("cli_nt_session_open: cli_open failed on pipe %s to machine %s. \
|
||||
Error was %s\n", pipe_name, cli->desthost, cli_errstr(cli)));
|
||||
DEBUG(0,("cli_nt_session_open: cli_open failed on pipe %s to machine %s. Error was %s\n",
|
||||
pipe_name, cli->desthost, cli_errstr(cli)));
|
||||
return False;
|
||||
}
|
||||
|
||||
@ -665,7 +657,8 @@ Error was %s\n", pipe_name, cli->desthost, cli_errstr(cli)));
|
||||
/******************* bind request on pipe *****************/
|
||||
if (!rpc_pipe_bind(cli, pipe_name, &abstract, &transfer, encrypted))
|
||||
{
|
||||
DEBUG(0,("cli_nt_session_open: rpc bind failed. Error was %s\n", cli_errstr(cli)));
|
||||
DEBUG(0,("cli_nt_session_open: rpc bind failed. Error was %s\n",
|
||||
cli_errstr(cli)));
|
||||
cli_close(cli, cli->nt_pipe_fnum);
|
||||
return False;
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ extern int DEBUGLEVEL;
|
||||
/****************************************************************************
|
||||
do a server net conn enum
|
||||
****************************************************************************/
|
||||
BOOL do_srv_net_srv_conn_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
BOOL do_srv_net_srv_conn_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_CONN_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
@ -70,7 +70,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
srv_io_q_net_conn_enum("", &q_o, &data, 0);
|
||||
|
||||
/* send the data on \PIPE\ */
|
||||
if (rpc_api_pipe_req(cli, t_idx, fnum, SRV_NETCONNENUM, &data, &rdata))
|
||||
if (rpc_api_pipe_req(cli, SRV_NETCONNENUM, &data, &rdata))
|
||||
{
|
||||
SRV_R_NET_CONN_ENUM r_o;
|
||||
BOOL p;
|
||||
@ -111,7 +111,7 @@ BOOL do_srv_net_srv_conn_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
/****************************************************************************
|
||||
do a server net sess enum
|
||||
****************************************************************************/
|
||||
BOOL do_srv_net_srv_sess_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
BOOL do_srv_net_srv_sess_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_SESS_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
@ -147,7 +147,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
srv_io_q_net_sess_enum("", &q_o, &data, 0);
|
||||
|
||||
/* send the data on \PIPE\ */
|
||||
if (rpc_api_pipe_req(cli, t_idx, fnum, SRV_NETSESSENUM, &data, &rdata))
|
||||
if (rpc_api_pipe_req(cli, SRV_NETSESSENUM, &data, &rdata))
|
||||
{
|
||||
SRV_R_NET_SESS_ENUM r_o;
|
||||
BOOL p;
|
||||
@ -188,7 +188,7 @@ BOOL do_srv_net_srv_sess_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
/****************************************************************************
|
||||
do a server net share enum
|
||||
****************************************************************************/
|
||||
BOOL do_srv_net_srv_share_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
BOOL do_srv_net_srv_share_enum(struct cli_state *cli,
|
||||
char *server_name,
|
||||
uint32 switch_value, SRV_SHARE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
@ -226,7 +226,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
srv_io_q_net_share_enum("", &q_o, &data, 0);
|
||||
|
||||
/* send the data on \PIPE\ */
|
||||
if (rpc_api_pipe_req(cli, t_idx, fnum, SRV_NETSHAREENUM, &data, &rdata))
|
||||
if (rpc_api_pipe_req(cli, SRV_NETSHAREENUM, &data, &rdata))
|
||||
{
|
||||
SRV_R_NET_SHARE_ENUM r_o;
|
||||
BOOL p;
|
||||
@ -267,7 +267,7 @@ BOOL do_srv_net_srv_share_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
/****************************************************************************
|
||||
do a server net file enum
|
||||
****************************************************************************/
|
||||
BOOL do_srv_net_srv_file_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
BOOL do_srv_net_srv_file_enum(struct cli_state *cli,
|
||||
char *server_name, char *qual_name,
|
||||
uint32 switch_value, SRV_FILE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
@ -305,7 +305,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
srv_io_q_net_file_enum("", &q_o, &data, 0);
|
||||
|
||||
/* send the data on \PIPE\ */
|
||||
if (rpc_api_pipe_req(cli, t_idx, fnum, SRV_NETFILEENUM, &data, &rdata))
|
||||
if (rpc_api_pipe_req(cli, SRV_NETFILEENUM, &data, &rdata))
|
||||
{
|
||||
SRV_R_NET_FILE_ENUM r_o;
|
||||
BOOL p;
|
||||
@ -346,7 +346,7 @@ BOOL do_srv_net_srv_file_enum(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
/****************************************************************************
|
||||
do a server get info
|
||||
****************************************************************************/
|
||||
BOOL do_srv_net_srv_get_info(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
BOOL do_srv_net_srv_get_info(struct cli_state *cli,
|
||||
char *server_name, uint32 switch_value, SRV_INFO_CTR *ctr)
|
||||
{
|
||||
prs_struct data;
|
||||
@ -370,7 +370,7 @@ BOOL do_srv_net_srv_get_info(struct cli_state *cli, int t_idx, uint16 fnum,
|
||||
srv_io_q_net_srv_get_info("", &q_o, &data, 0);
|
||||
|
||||
/* send the data on \PIPE\ */
|
||||
if (rpc_api_pipe_req(cli, t_idx, fnum, SRV_NET_SRV_GET_INFO, &data, &rdata))
|
||||
if (rpc_api_pipe_req(cli, SRV_NET_SRV_GET_INFO, &data, &rdata))
|
||||
{
|
||||
SRV_R_NET_SRV_GET_INFO r_o;
|
||||
BOOL p;
|
||||
|
||||
@ -295,6 +295,29 @@ static void srv_io_srv_share_ctr(char *desc, SRV_SHARE_INFO_CTR *ctr, prs_struc
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
void make_srv_q_net_share_enum(SRV_Q_NET_SHARE_ENUM *q_n,
|
||||
char *srv_name,
|
||||
uint32 share_level, SRV_SHARE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd)
|
||||
{
|
||||
if (q_n == NULL || ctr == NULL || hnd == NULL) return;
|
||||
|
||||
q_n->ctr = ctr;
|
||||
|
||||
DEBUG(5,("make_q_net_share_enum\n"));
|
||||
|
||||
make_buf_unistr2(&(q_n->uni_srv_name), &(q_n->ptr_srv_name), srv_name);
|
||||
|
||||
q_n->share_level = share_level;
|
||||
q_n->preferred_len = preferred_len;
|
||||
|
||||
memcpy(&(q_n->enum_hnd), hnd, sizeof(*hnd));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
@ -600,6 +623,30 @@ static void srv_io_srv_sess_ctr(char *desc, SRV_SESS_INFO_CTR *ctr, prs_struct
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
void make_srv_q_net_sess_enum(SRV_Q_NET_SESS_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 sess_level, SRV_SESS_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd)
|
||||
{
|
||||
if (q_n == NULL || ctr == NULL || hnd == NULL) return;
|
||||
|
||||
q_n->ctr = ctr;
|
||||
|
||||
DEBUG(5,("make_q_net_sess_enum\n"));
|
||||
|
||||
make_buf_unistr2(&(q_n->uni_srv_name), &(q_n->ptr_srv_name), srv_name);
|
||||
make_buf_unistr2(&(q_n->uni_qual_name), &(q_n->ptr_qual_name), qual_name);
|
||||
|
||||
q_n->sess_level = sess_level;
|
||||
q_n->preferred_len = preferred_len;
|
||||
|
||||
memcpy(&(q_n->enum_hnd), hnd, sizeof(*hnd));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
@ -875,6 +922,30 @@ static void srv_io_srv_conn_ctr(char *desc, SRV_CONN_INFO_CTR *ctr, prs_struct
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
void make_srv_q_net_conn_enum(SRV_Q_NET_CONN_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 conn_level, SRV_CONN_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd)
|
||||
{
|
||||
if (q_n == NULL || ctr == NULL || hnd == NULL) return;
|
||||
|
||||
q_n->ctr = ctr;
|
||||
|
||||
DEBUG(5,("make_q_net_conn_enum\n"));
|
||||
|
||||
make_buf_unistr2(&(q_n->uni_srv_name ), &(q_n->ptr_srv_name ), srv_name );
|
||||
make_buf_unistr2(&(q_n->uni_qual_name), &(q_n->ptr_qual_name), qual_name);
|
||||
|
||||
q_n->conn_level = conn_level;
|
||||
q_n->preferred_len = preferred_len;
|
||||
|
||||
memcpy(&(q_n->enum_hnd), hnd, sizeof(*hnd));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
@ -1075,6 +1146,30 @@ static void srv_io_srv_file_ctr(char *desc, SRV_FILE_INFO_CTR *ctr, prs_struct
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
void make_srv_q_net_file_enum(SRV_Q_NET_FILE_ENUM *q_n,
|
||||
char *srv_name, char *qual_name,
|
||||
uint32 file_level, SRV_FILE_INFO_CTR *ctr,
|
||||
uint32 preferred_len,
|
||||
ENUM_HND *hnd)
|
||||
{
|
||||
if (q_n == NULL || ctr == NULL || hnd == NULL) return;
|
||||
|
||||
q_n->ctr = ctr;
|
||||
|
||||
DEBUG(5,("make_q_net_file_enum\n"));
|
||||
|
||||
make_buf_unistr2(&(q_n->uni_srv_name), &(q_n->ptr_srv_name), srv_name);
|
||||
make_buf_unistr2(&(q_n->uni_qual_name), &(q_n->ptr_qual_name), qual_name);
|
||||
|
||||
q_n->file_level = file_level;
|
||||
q_n->preferred_len = preferred_len;
|
||||
|
||||
memcpy(&(q_n->enum_hnd), hnd, sizeof(*hnd));
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
********************************************************************/
|
||||
@ -1285,6 +1380,20 @@ static void srv_io_info_ctr(char *desc, SRV_INFO_CTR *ctr, prs_struct *ps, int
|
||||
}
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
makes a SRV_Q_NET_SRV_GET_INFO structure.
|
||||
********************************************************************/
|
||||
void make_srv_q_net_srv_get_info(SRV_Q_NET_SRV_GET_INFO *srv,
|
||||
char *server_name, uint32 switch_value)
|
||||
{
|
||||
if (srv == NULL) return;
|
||||
|
||||
DEBUG(5,("make_srv_q_net_srv_get_info\n"));
|
||||
|
||||
make_buf_unistr2(&(srv->uni_srv_name), &(srv->ptr_srv_name), server_name);
|
||||
|
||||
srv->switch_value = switch_value;
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
reads or writes a structure.
|
||||
|
||||
@ -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)
|
||||
{
|
||||
|
||||
@ -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!)"},
|
||||
|
||||
Reference in New Issue
Block a user