diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-01-08 20:06:36 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:59 -0500 |
| commit | a9e3624bbcb240104af186233ba2de87586d77d3 (patch) | |
| tree | d95e13c1b205babc183edf3039d8aef8a35fd8f7 /source3 | |
| parent | 5740f6910e4a14b57adf5f83e758e16165a7b066 (diff) | |
| download | samba-a9e3624bbcb240104af186233ba2de87586d77d3.tar.gz samba-a9e3624bbcb240104af186233ba2de87586d77d3.tar.bz2 samba-a9e3624bbcb240104af186233ba2de87586d77d3.zip | |
r20617: Do not notify if the delete failed
(This used to be commit c86fbdf8cc8f6f17b23e647bd1f4714c6095b860)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/reply.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index ac0663d238..cc181223f2 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -2032,10 +2032,10 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype, if (SMB_VFS_UNLINK(conn,directory) == 0) { count++; + notify_fname(conn, orig_name, -1, + NOTIFY_ACTION_REMOVED); } - notify_fname(conn, orig_name, -1, NOTIFY_ACTION_REMOVED); - } else { struct smb_Dir *dir_hnd = NULL; const char *dname; @@ -2092,10 +2092,12 @@ NTSTATUS unlink_internals(connection_struct *conn, uint32 dirtype, if (!NT_STATUS_IS_OK(error)) { continue; } - if (SMB_VFS_UNLINK(conn,fname) == 0) + if (SMB_VFS_UNLINK(conn,fname) == 0) { count++; - notify_action(conn, directory, dname, - -1, NOTIFY_ACTION_REMOVED); + notify_action( + conn, directory, dname, + -1, NOTIFY_ACTION_REMOVED); + } DEBUG(3,("unlink_internals: succesful unlink [%s]\n",fname)); } CloseDir(dir_hnd); |