svn commit: samba r15710 - in branches/SAMBA_4_0/source/smb_server/smb: .

metze at samba.org metze at samba.org
Fri May 19 13:44:39 GMT 2006


Author: metze
Date: 2006-05-19 13:44:39 +0000 (Fri, 19 May 2006)
New Revision: 15710

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15710

Log:
- we no longer need to set the nttrans out fields to zero
  in the backends
- some whitespace cleanups

metze
Modified:
   branches/SAMBA_4_0/source/smb_server/smb/nttrans.c


Changeset:
Modified: branches/SAMBA_4_0/source/smb_server/smb/nttrans.c
===================================================================
--- branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-05-19 13:37:43 UTC (rev 15709)
+++ branches/SAMBA_4_0/source/smb_server/smb/nttrans.c	2006-05-19 13:44:39 UTC (rev 15710)
@@ -275,11 +275,6 @@
 				      (ndr_pull_flags_fn_t)ndr_pull_security_descriptor);
 	NT_STATUS_NOT_OK_RETURN(status);
 
-	trans->out.setup_count = 0;
-	trans->out.setup       = NULL;
-	trans->out.params      = data_blob(NULL, 0);
-	trans->out.data        = data_blob(NULL, 0);
-
 	return ntvfs_setfileinfo(req->ntvfs, io);
 }
 
@@ -355,7 +350,6 @@
 
 	status = nttrans_setup_reply(op, op->trans, size, 0, 0);
 	NT_STATUS_NOT_OK_RETURN(status);
-
 	p = op->trans->out.params.data;
 
 	/* construct the changes buffer */
@@ -589,17 +583,17 @@
 	op->op_info = NULL;
 	op->send_fn = NULL;
 
-	trans->in.max_setup   = CVAL(req->in.vwv, 0);
+	trans->in.max_setup  = CVAL(req->in.vwv, 0);
 	param_total          = IVAL(req->in.vwv, 3);
 	data_total           = IVAL(req->in.vwv, 7);
-	trans->in.max_param   = IVAL(req->in.vwv, 11);
-	trans->in.max_data    = IVAL(req->in.vwv, 15);
+	trans->in.max_param  = IVAL(req->in.vwv, 11);
+	trans->in.max_data   = IVAL(req->in.vwv, 15);
 	param_count          = IVAL(req->in.vwv, 19);
 	param_ofs            = IVAL(req->in.vwv, 23);
 	data_count           = IVAL(req->in.vwv, 27);
 	data_ofs             = IVAL(req->in.vwv, 31);
-	trans->in.setup_count = CVAL(req->in.vwv, 35);
-	trans->in.function	 = SVAL(req->in.vwv, 36);
+	trans->in.setup_count= CVAL(req->in.vwv, 35);
+	trans->in.function   = SVAL(req->in.vwv, 36);
 
 	if (req->in.wct != 19 + trans->in.setup_count) {
 		smbsrv_send_error(req, NT_STATUS_DOS(ERRSRV, ERRerror));



More information about the samba-cvs mailing list