From: Volker Lendecke <vl@samba.org>
Date: Thu, 19 Jun 2008 13:48:05 +0000 (+0200)
Subject: Remove current_user_info reference from vfs_recycle.c
X-Git-Tag: samba-4.0.0alpha6~801^2~981
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=39479c9ee64b1e10e9e2633d96cf3827870def58;p=thirdparty%2Fsamba.git

Remove current_user_info reference from vfs_recycle.c
(This used to be commit fdc03c0a5ba0da4fbc4610880e06150c11d4c737)
---

diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index e6028cebdda..207f04bc475 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -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 */