Changeset 746 for vendor/current/source3/smbd/close.c

Timestamp:

Nov 27, 2012, 4:56:06 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated vendor to 3.6.9

File:

• vendor/current/source3/smbd/close.c (modified) (12 diffs)

vendor/current/source3/smbd/close.c

@@ -202 +202 @@
 NTSTATUS delete_all_streams(connection_struct *conn, const char *fname)
 {
-        struct stream_struct *stream_info;
+        struct stream_struct *stream_info = NULL;
         int i;
-        unsigned int num_streams;
+        unsigned int num_streams = 0;
         TALLOC_CTX *frame = talloc_stackframe();
         NTSTATUS status;
 
-        status = SMB_VFS_STREAMINFO(conn, NULL, fname, talloc_tos(),
-                                    &num_streams, &stream_info);
+        status = vfs_streaminfo(conn, NULL, fname, talloc_tos(),
+                                &num_streams, &stream_info);
 
         if (NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
@@ -218 +218 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(10, ("SMB_VFS_STREAMINFO failed: %s\n",
+                DEBUG(10, ("vfs_streaminfo failed: %s\n",
                            nt_errstr(status)));
                 goto fail;
@@ -281 +281 @@
         struct file_id id;
         const struct security_unix_token *del_token = NULL;
+        const struct security_token *del_nt_token = NULL;
+        bool got_tokens = false;
 
         /* Ensure any pending write time updates are done. */
@@ -346 +348 @@
                 }
                 fsp->delete_on_close = true;
-                set_delete_on_close_lck(fsp, lck, True, get_current_utok(conn));
+                set_delete_on_close_lck(fsp, lck, True,
+                                get_current_nttok(conn),
+                                get_current_utok(conn));
                 if (became_user) {
                         unbecome_user();
@@ -399 +403 @@
         fsp->update_write_time_on_close = false;
 
-        del_token = get_delete_on_close_token(lck, fsp->name_hash);
-        SMB_ASSERT(del_token != NULL);
+        got_tokens = get_delete_on_close_token(lck, fsp->name_hash,
+                                        &del_nt_token, &del_token);
+        SMB_ASSERT(got_tokens);
 
         if (!unix_token_equal(del_token, get_current_utok(conn))) {
@@ -419 +424 @@
                             del_token->ngroups,
                             del_token->groups,
-                            NULL);
+                            del_nt_token);
 
                 changed_user = true;
@@ -492 +497 @@
 
         fsp->delete_on_close = false;
-        set_delete_on_close_lck(fsp, lck, false, NULL);
+        set_delete_on_close_lck(fsp, lck, false, NULL, NULL);
 
  done:
@@ -818 +823 @@
         }
 
-        if(((errno == ENOTEMPTY)||(errno == EEXIST)) && lp_veto_files(SNUM(conn))) {
+        if(((errno == ENOTEMPTY)||(errno == EEXIST)) && *lp_veto_files(SNUM(conn))) {
                 /*
                  * Check to see if the only thing in this directory are
@@ -963 +968 @@
         NTSTATUS status = NT_STATUS_OK;
         NTSTATUS status1 = NT_STATUS_OK;
+        const struct security_token *del_nt_token = NULL;
         const struct security_unix_token *del_token = NULL;
 
@@ -999 +1005 @@
                                                fsp->fsp_name->base_name);
                 set_delete_on_close_lck(fsp, lck, true,
+                                get_current_nttok(fsp->conn),
                                 get_current_utok(fsp->conn));
                 fsp->delete_on_close = true;
@@ -1006 +1013 @@
         }
 
-        del_token = get_delete_on_close_token(lck, fsp->name_hash);
-        delete_dir = (del_token != NULL);
+        delete_dir = get_delete_on_close_token(lck, fsp->name_hash,
+                                        &del_nt_token, &del_token);
 
         if (delete_dir) {
@@ -1039 +1046 @@
                                 del_token->ngroups,
                                 del_token->groups,
-                                NULL);
+                                del_nt_token);
 
                 TALLOC_FREE(lck);
+
+                if ((fsp->conn->fs_capabilities & FILE_NAMED_STREAMS)
+                    && !is_ntfs_stream_smb_fname(fsp->fsp_name)) {
+
+                        status = delete_all_streams(fsp->conn, fsp->fsp_name->base_name);
+                        if (!NT_STATUS_IS_OK(status)) {
+                                DEBUG(5, ("delete_all_streams failed: %s\n",
+                                          nt_errstr(status)));
+                                goto out;
+                        }
+                }
 
                 status = rmdir_internals(talloc_tos(), fsp);