svn commit: samba r24100 - in branches/SAMBA_3_2/source/smbd: .

[vlendec at samba.org]

Author: vlendec
Date: 2007-07-31 10:04:54 +0000 (Tue, 31 Jul 2007)
New Revision: 24100

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

Log:
Convert reply_ntcancel to the new API
Modified:
   branches/SAMBA_3_2/source/smbd/nttrans.c
   branches/SAMBA_3_2/source/smbd/process.c


Changeset:
Modified: branches/SAMBA_3_2/source/smbd/nttrans.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/nttrans.c	2007-07-31 09:50:05 UTC (rev 24099)
+++ branches/SAMBA_3_2/source/smbd/nttrans.c	2007-07-31 10:04:54 UTC (rev 24100)
@@ -1786,23 +1786,21 @@
  conn POINTER CAN BE NULL HERE !
 ****************************************************************************/
 
-int reply_ntcancel(connection_struct *conn,
-		   char *inbuf,char *outbuf,int length,int bufsize)
+void reply_ntcancel(connection_struct *conn, struct smb_request *req)
 {
 	/*
 	 * Go through and cancel any pending change notifies.
 	 */
 	
-	int mid = SVAL(inbuf,smb_mid);
 	START_PROFILE(SMBntcancel);
-	remove_pending_change_notify_requests_by_mid(mid);
-	remove_pending_lock_requests_by_mid(mid);
-	srv_cancel_sign_response(mid);
+	remove_pending_change_notify_requests_by_mid(req->mid);
+	remove_pending_lock_requests_by_mid(req->mid);
+	srv_cancel_sign_response(req->mid);
 	
-	DEBUG(3,("reply_ntcancel: cancel called on mid = %d.\n", mid));
+	DEBUG(3,("reply_ntcancel: cancel called on mid = %d.\n", req->mid));
 
 	END_PROFILE(SMBntcancel);
-	return(-1);
+	return;
 }
 
 /****************************************************************************

Modified: branches/SAMBA_3_2/source/smbd/process.c
===================================================================
--- branches/SAMBA_3_2/source/smbd/process.c	2007-07-31 09:50:05 UTC (rev 24099)
+++ branches/SAMBA_3_2/source/smbd/process.c	2007-07-31 10:04:54 UTC (rev 24100)
@@ -852,7 +852,7 @@
 /* 0xa1 */ { "SMBnttranss", reply_nttranss,NULL, AS_USER | CAN_IPC },
 /* 0xa2 */ { "SMBntcreateX", NULL,reply_ntcreate_and_X, AS_USER | CAN_IPC },
 /* 0xa3 */ { NULL, NULL, NULL, 0 },
-/* 0xa4 */ { "SMBntcancel", reply_ntcancel,NULL, 0 },
+/* 0xa4 */ { "SMBntcancel", NULL,reply_ntcancel, 0 },
 /* 0xa5 */ { "SMBntrename", reply_ntrename,NULL, AS_USER | NEED_WRITE },
 /* 0xa6 */ { NULL, NULL, NULL, 0 },
 /* 0xa7 */ { NULL, NULL, NULL, 0 },