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

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  50fbfa03483de0059d85967dc96f2896e55e6d04 (commit)
      from  94a4d7fa3209eb668161b8110af6f877b4833fa7 (commit)

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


- Log -----------------------------------------------------------------
commit 50fbfa03483de0059d85967dc96f2896e55e6d04
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jun 16 23:50:17 2008 +0200

    Remove reference to current_user from modules/nfs4_acls.c .
    
    Michael

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

Summary of changes:
 source/modules/nfs4_acls.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/modules/nfs4_acls.c b/source/modules/nfs4_acls.c
index 0c3d010..927163d 100644
--- a/source/modules/nfs4_acls.c
+++ b/source/modules/nfs4_acls.c
@@ -42,7 +42,6 @@ typedef struct _SMB_ACL4_INT_T
 	SMB_ACE4_INT_T	*last;
 } SMB_ACL4_INT_T;
 
-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);
@@ -732,7 +731,7 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
 			need_chown = True;
 		}
 		if (need_chown) {
-			if ((newUID == (uid_t)-1 || newUID == current_user.ut.uid)) {
+			if ((newUID == (uid_t)-1 || newUID == fsp->conn->server_info->uid)) {
 				if(try_chown(fsp->conn, fsp->fsp_name, newUID, newGID)) {
 					DEBUG(3,("chown %s, %u, %u failed. Error = %s.\n",
 						 fsp->fsp_name, (unsigned int)newUID, (unsigned int)newGID, 


-- 
Samba Shared Repository