Changeset 222 for branches/samba-3.3.x/source/locking/locking.c

Timestamp:

May 24, 2009, 7:45:16 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

File:

• branches/samba-3.3.x/source/locking/locking.c (modified) (5 diffs)

branches/samba-3.3.x/source/locking/locking.c

@@ -1283 +1283 @@
 *************************************************************************/
 
-static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, UNIX_USER_TOKEN *tok)
+static UNIX_USER_TOKEN *copy_unix_token(TALLOC_CTX *ctx, const UNIX_USER_TOKEN *tok)
 {
         UNIX_USER_TOKEN *cpy;
@@ -1314 +1314 @@
 ****************************************************************************/
 
-void set_delete_on_close_token(struct share_mode_lock *lck, UNIX_USER_TOKEN *tok)
+void set_delete_on_close_token(struct share_mode_lock *lck, const UNIX_USER_TOKEN *tok)
 {
         TALLOC_FREE(lck->delete_token); /* Also deletes groups... */
@@ -1334 +1334 @@
 ****************************************************************************/
 
-void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, UNIX_USER_TOKEN *tok)
+void set_delete_on_close_lck(struct share_mode_lock *lck, bool delete_on_close, const UNIX_USER_TOKEN *tok)
 {
         if (lck->delete_on_close != delete_on_close) {
@@ -1346 +1346 @@
 }
 
-bool set_delete_on_close(files_struct *fsp, bool delete_on_close, UNIX_USER_TOKEN *tok)
-{
+bool set_delete_on_close(files_struct *fsp, bool delete_on_close, const UNIX_USER_TOKEN *tok)
+{
+        UNIX_USER_TOKEN *tok_copy = NULL;
         struct share_mode_lock *lck;
         
@@ -1359 +1360 @@
         if (lck == NULL) {
                 return False;
+        }
+
+        if (fsp->conn->admin_user) {
+                tok_copy = copy_unix_token(lck, tok);
+                tok_copy->uid = (uid_t)0;
+                if (tok_copy == NULL) {
+                        TALLOC_FREE(lck);
+                        return false;
+                }
+                tok = tok_copy;
         }