The branch, v3-5-test has been updated via 3e6f961... Fix bug #7384 - dptr_Close has a bitmap leak. from c1ae6d3... s3-net_conf: Display an error on net conf import failures.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test - Log ----------------------------------------------------------------- commit 3e6f961a7a6b4d0e41d0cf2c47ca2aebeea8f6af Author: Ira Cooper <sa...@ira.wakeful.net> Date: Fri Apr 23 10:55:46 2010 -0700 Fix bug #7384 - dptr_Close has a bitmap leak. s3: Fix to dptr_Close This fixes a bitmap "leak" in dptr_Close by making it use the same internal routines the rest of the code does. (cherry picked from commit dd2025947136f28b22b70de59309e149a1f45f3d) ----------------------------------------------------------------------- Summary of changes: source3/smbd/dir.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c index 5ce4a7b..fe8e243 100644 --- a/source3/smbd/dir.c +++ b/source3/smbd/dir.c @@ -555,9 +555,7 @@ NTSTATUS dptr_create(connection_struct *conn, const char *path, bool old_handle, int dptr_CloseDir(struct dptr_struct *dptr) { - struct smbd_server_connection *sconn = dptr->conn->sconn; - DLIST_REMOVE(sconn->smb1.searches.dirptrs, dptr); - TALLOC_FREE(dptr->dir_hnd); + dptr_close_internal(dptr); return 0; } -- Samba Shared Repository