]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
Remove reference to current_user from modules/nfs4_acls.c .
authorMichael Adam <obnox@samba.org>
Mon, 16 Jun 2008 21:50:17 +0000 (23:50 +0200)
committerVolker Lendecke <vl@samba.org>
Tue, 17 Jun 2008 08:33:12 +0000 (10:33 +0200)
Michael
(This used to be commit 50fbfa03483de0059d85967dc96f2896e55e6d04)

source3/modules/nfs4_acls.c

index 0c3d010dcde64553487648b50ef23dc6e46d619f..927163d7b0fab91511ba8f115d9e0eada1228bfe 100644 (file)
@@ -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,