[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-2915-gfdc03c0

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  fdc03c0a5ba0da4fbc4610880e06150c11d4c737 (commit)
       via  a227181e8d2ed0824a323a3d4b4cfda5e438f8ce (commit)
       via  05a66980a9b5a7c6222ceb038d819d23fd172186 (commit)
       via  407136abdf45ad832382dba44e1c9a3b4f253f09 (commit)
      from  51b5364c2afb3a18df4bec2bc1624760ccc01676 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit fdc03c0a5ba0da4fbc4610880e06150c11d4c737
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 15:48:05 2008 +0200

    Remove current_user_info reference from vfs_recycle.c

commit a227181e8d2ed0824a323a3d4b4cfda5e438f8ce
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 15:46:44 2008 +0200

    Remove current_user_info reference from vfs_fake_perms.c

commit 05a66980a9b5a7c6222ceb038d819d23fd172186
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 15:44:15 2008 +0200

    Remove current_user_info reference from vfs_expand_msdfs.c

commit 407136abdf45ad832382dba44e1c9a3b4f253f09
Author: Volker Lendecke <vl at samba.org>
Date:   Thu Jun 19 15:43:52 2008 +0200

    current_user is not used in vfs_aixacl2.c

-----------------------------------------------------------------------

Summary of changes:
 source/modules/vfs_aixacl2.c      |    1 -
 source/modules/vfs_expand_msdfs.c |    4 +---
 source/modules/vfs_fake_perms.c   |   10 ++++------
 source/modules/vfs_recycle.c      |    4 +---
 4 files changed, 6 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/vfs_aixacl2.c b/source/modules/vfs_aixacl2.c
index ffcec7c..9e4c513 100644
--- a/source/modules/vfs_aixacl2.c
+++ b/source/modules/vfs_aixacl2.c
@@ -25,7 +25,6 @@
 
 #define AIXACL2_MODULE_NAME "aixacl2"
 
-extern struct current_user current_user;
 extern int try_chown(connection_struct *conn, const char *fname, uid_t uid, gid_t gid);
 extern NTSTATUS unpack_nt_owners(int snum, uid_t *puser, gid_t *pgrp,
 	uint32 security_info_sent, SEC_DESC *psd);
diff --git a/source/modules/vfs_expand_msdfs.c b/source/modules/vfs_expand_msdfs.c
index 9b85ad2..3654ae4 100644
--- a/source/modules/vfs_expand_msdfs.c
+++ b/source/modules/vfs_expand_msdfs.c
@@ -22,8 +22,6 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
-extern userdom_struct current_user_info;
-
 /**********************************************************
   Under mapfile we expect a table of the following format:
 
@@ -149,7 +147,7 @@ static char *expand_msdfs_target(TALLOC_CTX *ctx,
 				conn->connectpath,
 				conn->server_info->gid,
 				conn->server_info->sanitized_username,
-				current_user_info.domain,
+				pdb_get_domain(conn->server_info->sam_account),
 				targethost);
 
 	DEBUG(10, ("Expanded targethost to %s\n", targethost));
diff --git a/source/modules/vfs_fake_perms.c b/source/modules/vfs_fake_perms.c
index ddad000..ef0a2c3 100644
--- a/source/modules/vfs_fake_perms.c
+++ b/source/modules/vfs_fake_perms.c
@@ -23,8 +23,6 @@
 
 #include "includes.h"
 
-extern struct current_user current_user;
-
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_VFS
 
@@ -39,8 +37,8 @@ static int fake_perms_stat(vfs_handle_struct *handle, const char *fname, SMB_STR
 		} else {
 			sbuf->st_mode = S_IRWXU;
 		}
-		sbuf->st_uid = current_user.ut.uid;
-		sbuf->st_gid = current_user.ut.gid;
+		sbuf->st_uid = handle->conn->server_info->uid;
+		sbuf->st_gid = handle->conn->server_info->gid;
 	}
 
 	return ret;
@@ -57,8 +55,8 @@ static int fake_perms_fstat(vfs_handle_struct *handle, files_struct *fsp, SMB_ST
 		} else {
 			sbuf->st_mode = S_IRWXU;
 		}
-		sbuf->st_uid = current_user.ut.uid;
-		sbuf->st_gid = current_user.ut.gid;
+		sbuf->st_uid = handle->conn->server_info->uid;
+		sbuf->st_gid = handle->conn->server_info->gid;
 	}
 	return ret;
 }
diff --git a/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c
index e6028ce..207f04b 100644
--- a/source/modules/vfs_recycle.c
+++ b/source/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 */


-- 
Samba Shared Repository