summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-06-16 23:50:17 +0200
committerVolker Lendecke <vl@samba.org>2008-06-17 10:33:12 +0200
commite1732fae331dd15a0a05c309baa6f7fd02f220e4 (patch)
tree79093e6866551e60dbfdfce43d33c4b70ece98dd
parenta7cf0bd32aa3b5a26d361e300247638d1e0e159e (diff)
downloadsamba-e1732fae331dd15a0a05c309baa6f7fd02f220e4.tar.gz
samba-e1732fae331dd15a0a05c309baa6f7fd02f220e4.tar.bz2
samba-e1732fae331dd15a0a05c309baa6f7fd02f220e4.zip
Remove reference to current_user from modules/nfs4_acls.c .
Michael (This used to be commit 50fbfa03483de0059d85967dc96f2896e55e6d04)
-rw-r--r--source3/modules/nfs4_acls.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 0c3d010dcd..927163d7b0 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/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,