summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-03-22 11:49:24 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:59:03 -0500
commit8ae3773bc45268f5a9291f47ef9204386c500a91 (patch)
treef7bef044d32e6531cb98ce2df2c176a2be5d6960
parent0aeb2a50b1fbad02fa676664ba1a1518994f1657 (diff)
downloadsamba-8ae3773bc45268f5a9291f47ef9204386c500a91.tar.gz
samba-8ae3773bc45268f5a9291f47ef9204386c500a91.tar.bz2
samba-8ae3773bc45268f5a9291f47ef9204386c500a91.zip
r14638: we need to call smbsrv_setup_reply() before using smbsrv_setup_error()
tridge: can you please check if the whole function ok? jelmer: this fixes a crash bug, when asking for Security Descriptors and should be in the TP2 metze (This used to be commit b5edcde79339be0fec94e440a87c8191cf53e937)
-rw-r--r--source4/smb_server/smb/nttrans.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/smb_server/smb/nttrans.c b/source4/smb_server/smb/nttrans.c
index 4fbb1f656d..1bc828b0f0 100644
--- a/source4/smb_server/smb/nttrans.c
+++ b/source4/smb_server/smb/nttrans.c
@@ -465,6 +465,8 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
}
}
+ smbsrv_setup_reply(req, 18 + trans->out.setup_count, 0);
+
/* note that we don't check the max_setup count (matching w2k3
behaviour) */
@@ -482,8 +484,6 @@ static void reply_nttrans_send(struct ntvfs_request *ntvfs)
params = trans->out.params.data;
data = trans->out.data.data;
- smbsrv_setup_reply(req, 18 + trans->out.setup_count, 0);
-
/* we need to divide up the reply into chunks that fit into
the negotiated buffer size */
do {