diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-07-31 10:04:54 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:29:06 -0500 |
| commit | 4473a5ec545ad4b087f6ac6738a961c6cddabb82 (patch) | |
| tree | 8147cf230077f0fb5c3625730f6fc1a3aa5a374b | |
| parent | 3edc6088aaff282530435ca19f70a96b22f045f4 (diff) | |
| download | samba-4473a5ec545ad4b087f6ac6738a961c6cddabb82.tar.gz samba-4473a5ec545ad4b087f6ac6738a961c6cddabb82.tar.bz2 samba-4473a5ec545ad4b087f6ac6738a961c6cddabb82.zip | |
r24100: Convert reply_ntcancel to the new API
(This used to be commit 6e5f39379f60e30cd0445a049df619ec8f65fc01)
| -rw-r--r-- | source3/smbd/nttrans.c | 14 | ||||
| -rw-r--r-- | source3/smbd/process.c | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 9aa824feda..8250942274 100644 --- a/source3/smbd/nttrans.c +++ b/source3/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/source3/smbd/process.c b/source3/smbd/process.c index 2773779898..ab2f205ebe 100644 --- a/source3/smbd/process.c +++ b/source3/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 }, |