summaryrefslogtreecommitdiff
path: root/source3/libsmb/cliconnect.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-09-05 11:32:59 +0000
committerAndrew Tridgell <tridge@samba.org>2001-09-05 11:32:59 +0000
commitd53d5beeb29c0024556aae2f66f1d5bfe63960e5 (patch)
tree0b362c3ab60bf8bfeb6c3221d1627aa0b40d89df /source3/libsmb/cliconnect.c
parent851a06e1fd6ac0d921f96fe9e9529129b4b4c01d (diff)
downloadsamba-d53d5beeb29c0024556aae2f66f1d5bfe63960e5.tar.gz
samba-d53d5beeb29c0024556aae2f66f1d5bfe63960e5.tar.bz2
samba-d53d5beeb29c0024556aae2f66f1d5bfe63960e5.zip
use cli_is_error() instead of looking in smb_rcls, otherwise NT status
codes don't work correctly (This used to be commit 55d5828e608671f070a9e96938be0d16d50aeb26)
Diffstat (limited to 'source3/libsmb/cliconnect.c')
-rw-r--r--source3/libsmb/cliconnect.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 8230edbd63..14faf6e8fe 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -188,7 +188,7 @@ BOOL cli_session_setup(struct cli_state *cli,
show_msg(cli->inbuf);
- if (CVAL(cli->inbuf,smb_rcls) != 0) {
+ if (cli_is_error(cli)) {
return False;
}
@@ -228,7 +228,7 @@ BOOL cli_ulogoff(struct cli_state *cli)
if (!cli_receive_smb(cli))
return False;
- return CVAL(cli->inbuf,smb_rcls) == 0;
+ return !cli_is_error(cli);
}
/****************************************************************************
@@ -292,13 +292,11 @@ BOOL cli_send_tconX(struct cli_state *cli,
cli_setup_bcc(cli, p);
- SCVAL(cli->inbuf,smb_rcls, 1);
-
cli_send_smb(cli);
if (!cli_receive_smb(cli))
return False;
- if (CVAL(cli->inbuf,smb_rcls) != 0) {
+ if (cli_is_error(cli)) {
return False;
}
@@ -339,7 +337,7 @@ BOOL cli_tdis(struct cli_state *cli)
if (!cli_receive_smb(cli))
return False;
- return CVAL(cli->inbuf,smb_rcls) == 0;
+ return !cli_is_error(cli);
}
@@ -412,7 +410,7 @@ BOOL cli_negprot(struct cli_state *cli)
show_msg(cli->inbuf);
- if (CVAL(cli->inbuf,smb_rcls) != 0 ||
+ if (cli_is_error(cli) ||
((int)SVAL(cli->inbuf,smb_vwv0) >= numprots)) {
return(False);
}