diff options
| author | Andrew Tridgell <tridge@samba.org> | 2008-10-03 12:23:00 -0700 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2008-10-03 12:23:00 -0700 |
| commit | 23ec448f83ab00105b214388df287f0a934cdb7a (patch) | |
| tree | de94cbd50e47eb7592e5bdf9e42643fb5aa4f239 /source3/smbd | |
| parent | 163fa1d25ae2104b634ba37ed97d51fe033cbc1f (diff) | |
| parent | c7625979ceb350d90d87d2add6ed7156440072c3 (diff) | |
| download | samba-23ec448f83ab00105b214388df287f0a934cdb7a.tar.gz samba-23ec448f83ab00105b214388df287f0a934cdb7a.tar.bz2 samba-23ec448f83ab00105b214388df287f0a934cdb7a.zip | |
Merge commit 'master/master'
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/conn.c | 2 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source3/smbd/conn.c b/source3/smbd/conn.c index b9433bb965..7f34d2b8e2 100644 --- a/source3/smbd/conn.c +++ b/source3/smbd/conn.c @@ -252,8 +252,8 @@ void conn_free_internal(connection_struct *conn) /* Free vfs_connection_struct */ handle = conn->vfs_handles; while(handle) { - DLIST_REMOVE(conn->vfs_handles, handle); thandle = handle->next; + DLIST_REMOVE(conn->vfs_handles, handle); if (handle->free_data) handle->free_data(&handle->data); handle = thandle; diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 6933533672..8bfa28faea 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -5583,10 +5583,10 @@ NTSTATUS rename_internals_fsp(connection_struct *conn, DEBUG(3,("rename_internals_fsp: succeeded doing rename on %s -> %s\n", fsp->fsp_name,newname)); - rename_open_files(conn, lck, newname); - notify_rename(conn, fsp->is_directory, fsp->fsp_name, newname); + rename_open_files(conn, lck, newname); + /* * A rename acts as a new file create w.r.t. allowing an initial delete * on close, probably because in Windows there is a new handle to the |