r24100: Convert reply_ntcancel to the new API

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index 9aa824fedaa98c4284e28a6a3bb8212afa9d2e84..8250942274b0458540ccc6a6fbc79375d4639a58 100644 (file)
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -1786,23 +1786,21 @@ static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *o
  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;
 }
 
 /****************************************************************************

diff --git a/source/smbd/process.c b/source/smbd/process.c
index 2773779898babec57bbcd885a72e3d1b26dd7b58..ab2f205ebebe32a75311da1bc85096689e82084c 100644 (file)
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -852,7 +852,7 @@ static const struct smb_message_struct {
 /* 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 },