summaryrefslogtreecommitdiffstats
path: root/source/libsmb/clitrans.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2001-08-27 08:19:43 +0000
committerAndrew Tridgell <tridge@samba.org>2001-08-27 08:19:43 +0000
commit83d9896c1ea8be796192b51a4678c2a3b87f7518 (patch)
tree3eca52e51950890d1a5b6e7c8b0ddfdee78a239a /source/libsmb/clitrans.c
parent9e0c9a99f6ca01cd6a0ee3084f85e1c36b11d7c3 (diff)
downloadsamba-83d9896c1ea8be796192b51a4678c2a3b87f7518.tar.gz
samba-83d9896c1ea8be796192b51a4678c2a3b87f7518.tar.xz
samba-83d9896c1ea8be796192b51a4678c2a3b87f7518.zip
converted smbd to use NTSTATUS by default
major changes include: - added NSTATUS type - added automatic mapping between dos and nt error codes - changed all ERROR() calls to ERROR_DOS() and many to ERROR_NT() these calls auto-translate to the client error code system - got rid of the cached error code and the writebmpx code We eventually will need to also: - get rid of BOOL, so we don't lose error info - replace all ERROR_DOS() calls with ERROR_NT() calls but that is too much for one night
Diffstat (limited to 'source/libsmb/clitrans.c')
-rw-r--r--source/libsmb/clitrans.c29
1 files changed, 17 insertions, 12 deletions
diff --git a/source/libsmb/clitrans.c b/source/libsmb/clitrans.c
index 4822508e380..6ae10144354 100644
--- a/source/libsmb/clitrans.c
+++ b/source/libsmb/clitrans.c
@@ -412,20 +412,25 @@ BOOL cli_receive_nt_trans(struct cli_state *cli,
total_param = SVAL(cli->inbuf,smb_ntr_TotalParameterCount);
/* allocate it */
- tdata = Realloc(*data,total_data);
- if (!tdata) {
- DEBUG(0,("cli_receive_nt_trans: failed to enlarge buffer"));
- return False;
+ if (total_data) {
+ tdata = Realloc(*data,total_data);
+ if (!tdata) {
+ DEBUG(0,("cli_receive_nt_trans: failed to enlarge data buffer to %d\n",total_data));
+ return False;
+ } else {
+ *data = tdata;
+ }
}
- else
- *data = tdata;
- tparam = Realloc(*param,total_param);
- if (!tparam) {
- DEBUG(0,("cli_receive_nt_trans: failed to enlarge buffer"));
- return False;
+
+ if (total_param) {
+ tparam = Realloc(*param,total_param);
+ if (!tparam) {
+ DEBUG(0,("cli_receive_nt_trans: failed to enlarge param buffer to %d\n", total_param));
+ return False;
+ } else {
+ *param = tparam;
+ }
}
- else
- *param = tparam;
while (1) {
this_data = SVAL(cli->inbuf,smb_ntr_DataCount);