summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Leighton <lkcl@samba.org>1997-10-23 19:27:53 +0000
committerLuke Leighton <lkcl@samba.org>1997-10-23 19:27:53 +0000
commit5557ab3c007b79c132e9a2da16e41be7b13f1b39 (patch)
tree957be215eb405416705681f6c71bae1051c4d28a
parent56214b5089b122d5fa1567a8458f61d1a377d69e (diff)
downloadsamba-5557ab3c007b79c132e9a2da16e41be7b13f1b39.tar.gz
samba-5557ab3c007b79c132e9a2da16e41be7b13f1b39.tar.bz2
samba-5557ab3c007b79c132e9a2da16e41be7b13f1b39.zip
renamed static cli_setup_pkt() to static cli_setup_packet() because it
clashed with the currently-used cli_setup_pkt() in clientutil.c (This used to be commit 25560cf40b997e400d16fa0c1380e5bc29c015a5)
-rw-r--r--source3/libsmb/clientgen.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d47c5a2755..7cd2ef6903 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -31,7 +31,7 @@ extern int DEBUGLEVEL;
/****************************************************************************
setup basics in a outgoing packet
****************************************************************************/
-static void cli_setup_pkt(struct cli_state *cli)
+static void cli_setup_packet(struct cli_state *cli)
{
SSVAL(cli->outbuf,smb_pid,cli->pid);
SSVAL(cli->outbuf,smb_uid,cli->uid);
@@ -64,7 +64,7 @@ static BOOL cli_send_trans(struct cli_state *cli,
set_message(cli->outbuf,14+lsetup,0,True);
CVAL(cli->outbuf,smb_com) = trans;
SSVAL(cli->outbuf,smb_tid, cli->cnum);
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
outparam = smb_buf(cli->outbuf)+(trans==SMBtrans ? strlen(name)+1 : 3);
outdata = outparam+this_lparam;
@@ -367,7 +367,7 @@ BOOL cli_session_setup(struct cli_state *cli,
if (cli->protocol < PROTOCOL_NT1) {
set_message(cli->outbuf,10,1 + strlen(user) + passlen,True);
CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
CVAL(cli->outbuf,smb_vwv0) = 0xFF;
SSVAL(cli->outbuf,smb_vwv2,cli->max_xmit);
@@ -383,7 +383,7 @@ BOOL cli_session_setup(struct cli_state *cli,
} else {
set_message(cli->outbuf,13,0,True);
CVAL(cli->outbuf,smb_com) = SMBsesssetupX;
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
CVAL(cli->outbuf,smb_vwv0) = 0xFF;
SSVAL(cli->outbuf,smb_vwv2,BUFFER_SIZE);
@@ -438,7 +438,7 @@ BOOL cli_send_tconX(struct cli_state *cli,
set_message(cli->outbuf,4,
2 + strlen(share) + passlen + strlen(dev),True);
CVAL(cli->outbuf,smb_com) = SMBtconX;
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
SSVAL(cli->outbuf,smb_vwv0,0xFF);
SSVAL(cli->outbuf,smb_vwv3,passlen);
@@ -474,7 +474,7 @@ BOOL cli_tdis(struct cli_state *cli)
set_message(cli->outbuf,0,0,True);
CVAL(cli->outbuf,smb_com) = SMBtdis;
SSVAL(cli->outbuf,smb_tid,cli->cnum);
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
send_smb(cli->fd,cli->outbuf);
if (!receive_smb(cli->fd,cli->inbuf,cli->timeout))
@@ -513,7 +513,7 @@ BOOL cli_negprot(struct cli_state *cli)
}
CVAL(cli->outbuf,smb_com) = SMBnegprot;
- cli_setup_pkt(cli);
+ cli_setup_packet(cli);
CVAL(smb_buf(cli->outbuf),0) = 2;