use talloc_tos in a few more places

(This used to be commit 65dd869bea351010c67f02046ae4134bdada1a4c)

diff --git a/source3/locking/locking.c b/source3/locking/locking.c
index 2ec8cd29386d404cc8dc426ab065951c8caa3d8b..ce7ba8fa6637de8116de1b6aaaeed6f42de98f8d 100644 (file)
--- a/source3/locking/locking.c
+++ b/source3/locking/locking.c
@@ -925,7 +925,7 @@ bool get_delete_on_close_flag(struct file_id id)
        bool result;
        struct share_mode_lock *lck;
   
-       if (!(lck = fetch_share_mode_unlocked(NULL, id, NULL, NULL))) {
+       if (!(lck = fetch_share_mode_unlocked(talloc_tos(), id, NULL, NULL))) {
                return False;
        }
        result = lck->delete_on_close;
@@ -1328,7 +1328,7 @@ bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKE
                return True;
        }
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
        if (lck == NULL) {
                return False;
        }

diff --git a/source3/smbd/close.c b/source3/smbd/close.c
index 5d30e467d0979dff9c12dbd8b6548a2445f10829..c74e13348e16c3212b4c95b12f121829f1518f61 100644 (file)
--- a/source3/smbd/close.c
+++ b/source3/smbd/close.c
@@ -176,7 +176,7 @@ static NTSTATUS close_remove_share_mode(files_struct *fsp,
         * This prevents race conditions with the file being created. JRA.
         */
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
 
        if (lck == NULL) {
                DEBUG(0, ("close_remove_share_mode: Could not get share mode "
@@ -441,7 +441,7 @@ static NTSTATUS close_directory(files_struct *fsp, enum file_close_type close_ty
         * reference to a directory also.
         */
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
 
        if (lck == NULL) {
                DEBUG(0, ("close_directory: Could not get share mode lock for %s\n", fsp->fsp_name));

diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index 95e45a699003594ae642918b983c065c7ff7aff4..016c8adb1bd59d2e39ab93f51900c1cd189b7c32 100644 (file)
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -132,7 +132,7 @@ bool claim_connection(connection_struct *conn, const char *name,
 
        DEBUG(5,("claiming [%s]\n", name));
 
-       if (!(rec = connections_fetch_entry(NULL, conn, name))) {
+       if (!(rec = connections_fetch_entry(talloc_tos(), conn, name))) {
                DEBUG(0, ("connections_fetch_entry failed\n"));
                return False;
        }

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index 037ab633e3bfd52473d4f4ee2f5b73a2ee27d04e..59699dfbd0f67b08a95798d92a87fcb2bac9082e 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -1221,7 +1221,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
                request_time = pml->request_time;
 
                /* Remove the deferred open entry under lock. */
-               lck = get_share_mode_lock(NULL, state->id, NULL, NULL);
+               lck = get_share_mode_lock(talloc_tos(), state->id, NULL, NULL);
                if (lck == NULL) {
                        DEBUG(0, ("could not get share mode lock\n"));
                } else {
@@ -1451,7 +1451,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
        if (file_existed) {
                id = vfs_file_id_from_sbuf(conn, psbuf);
 
-               lck = get_share_mode_lock(NULL, id,
+               lck = get_share_mode_lock(talloc_tos(), id,
                                          conn->connectpath,
                                          fname);
 
@@ -1678,7 +1678,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
 
                id = fsp->file_id;
 
-               lck = get_share_mode_lock(NULL, id,
+               lck = get_share_mode_lock(talloc_tos(), id,
                                          conn->connectpath,
                                          fname);
 
@@ -2212,7 +2212,7 @@ NTSTATUS open_directory(connection_struct *conn,
 
        string_set(&fsp->fsp_name,fname);
 
-       lck = get_share_mode_lock(NULL, fsp->file_id,
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id,
                                  conn->connectpath,
                                  fname);
 

diff --git a/source3/smbd/oplock.c b/source3/smbd/oplock.c
index 277e07c178e83f87f09e772f746b80c38710b927..420aa94fe6998eeb5ccdb1ec36d33d901954deb5 100644 (file)
--- a/source3/smbd/oplock.c
+++ b/source3/smbd/oplock.c
@@ -181,7 +181,7 @@ bool remove_oplock(files_struct *fsp)
        struct share_mode_lock *lck;
 
        /* Remove the oplock flag from the sharemode. */
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
        if (lck == NULL) {
                DEBUG(0,("remove_oplock: failed to lock share entry for "
                         "file %s\n", fsp->fsp_name ));
@@ -206,7 +206,7 @@ bool downgrade_oplock(files_struct *fsp)
        bool ret;
        struct share_mode_lock *lck;
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
        if (lck == NULL) {
                DEBUG(0,("downgrade_oplock: failed to lock share entry for "
                         "file %s\n", fsp->fsp_name ));
@@ -757,7 +757,7 @@ void release_level_2_oplocks_on_change(files_struct *fsp)
        if (!LEVEL_II_OPLOCK_TYPE(fsp->oplock_type))
                return;
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
        if (lck == NULL) {
                DEBUG(0,("release_level_2_oplocks_on_change: failed to lock "
                         "share mode entry for file %s.\n", fsp->fsp_name ));

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a796a3193b0f62c62d795ee9c61c23f741447023..79c0176e64ce10bd1098b9189c4048781207892c 100644 (file)
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -592,7 +592,8 @@ void reply_tcon_and_X(struct smb_request *req)
        }
 
        if (global_encrypted_passwords_negotiated) {
-               password = data_blob(smb_buf(req->inbuf),passlen);
+               password = data_blob_talloc(talloc_tos(), smb_buf(req->inbuf),
+                                           passlen);
                if (lp_security() == SEC_SHARE) {
                        /*
                         * Security = share always has a pad byte
@@ -603,7 +604,8 @@ void reply_tcon_and_X(struct smb_request *req)
                        p = smb_buf(req->inbuf) + passlen;
                }
        } else {
-               password = data_blob(smb_buf(req->inbuf),passlen+1);
+               password = data_blob_talloc(talloc_tos(), smb_buf(req->inbuf),
+                                           passlen+1);
                /* Ensure correct termination */
                password.data[passlen]=0;
                p = smb_buf(req->inbuf) + passlen + 1;
@@ -5508,7 +5510,7 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
                return NT_STATUS_ACCESS_DENIED;
        }
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
 
        /*
         * We have the file open ourselves, so not being able to get the

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ce0b239c4ec9f172284324b2d7e118079d8ae72a..bf6802f2a6c7e1a217daec4d07aa86efd4a2a01f 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -6193,7 +6193,7 @@ static NTSTATUS smb_posix_unlink(connection_struct *conn,
         * non-POSIX opens return SHARING_VIOLATION.
         */
 
-       lck = get_share_mode_lock(NULL, fsp->file_id, NULL, NULL);
+       lck = get_share_mode_lock(talloc_tos(), fsp->file_id, NULL, NULL);
        if (lck == NULL) {
                DEBUG(0, ("smb_posix_unlink: Could not get share mode "
                        "lock for file %s\n", fsp->fsp_name));