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

[Volker Lendecke]

The branch, v3-3-test has been updated
       via  2abb7cd867be307e56c02087e700189b17efb894 (commit)
      from  9c21756f9e841fd996590619b5eedc659f849626 (commit)

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


- Log -----------------------------------------------------------------
commit 2abb7cd867be307e56c02087e700189b17efb894
Author: Volker Lendecke <[EMAIL PROTECTED]>
Date:   Fri Jul 11 13:03:42 2008 +0200

    Fix the build of nfs4_acls.c

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

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


Changeset truncated at 500 lines:

diff --git a/source/modules/nfs4_acls.c b/source/modules/nfs4_acls.c
index 927163d..dc1b70c 100644
--- a/source/modules/nfs4_acls.c
+++ b/source/modules/nfs4_acls.c
@@ -731,7 +731,8 @@ NTSTATUS smb_set_nt_acl_nfs4(files_struct *fsp,
                        need_chown = True;
                }
                if (need_chown) {
-                       if ((newUID == (uid_t)-1 || newUID == 
fsp->conn->server_info->uid)) {
+                       if ((newUID == (uid_t)-1
+                            || newUID == fsp->conn->server_info->utok.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