Remove current_user_info reference from vfs_recycle.c
authorVolker Lendecke <vl@samba.org>
Thu, 19 Jun 2008 13:48:05 +0000 (15:48 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 19 Jun 2008 13:53:43 +0000 (15:53 +0200)
(This used to be commit fdc03c0a5ba0da4fbc4610880e06150c11d4c737)

source3/modules/vfs_recycle.c

index e6028cebdda14a3cffe2d1a94a2933bcff643ad9..207f04bc4750bc68910a600db570c4520fc0ff0d 100644 (file)
@@ -412,8 +412,6 @@ static void recycle_do_touch(vfs_handle_struct *handle, const char *fname,
        }
 }
 
-extern userdom_struct current_user_info;
-
 /**
  * Check if file should be recycled
  **/
@@ -436,7 +434,7 @@ static int recycle_unlink(vfs_handle_struct *handle, const char *file_name)
                                        conn->connectpath,
                                        conn->server_info->gid,
                                        conn->server_info->sanitized_username,
-                                       current_user_info.domain,
+                                       pdb_get_domain(conn->server_info->sam_account),
                                        recycle_repository(handle));
        ALLOC_CHECK(repository, done);
        /* shouldn't we allow absolute path names here? --metze */