[SCM] Samba Shared Repository - branch v3-5-test updated

Jeremy Allison jra at samba.org
Fri Oct 16 18:22:16 MDT 2009


The branch, v3-5-test has been updated
       via  90a291f... Last 2 VFS_STAT -> LSTAT fixes I can see in the modules code. Jeremy.
      from  9180559... Fix one missing STAT -> LSTAT with POSIX pathnames in vfs_xattr_tdb.c. Caught by the torture tester. I love unit tests :-). Jeremy.

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


- Log -----------------------------------------------------------------
commit 90a291f9581150d8a00fbb5e784f0b034f563d04
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Oct 16 17:20:40 2009 -0700

    Last 2 VFS_STAT -> LSTAT fixes I can see in the modules code.
    Jeremy.

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

Summary of changes:
 source3/modules/vfs_afsacl.c  |    9 ++++++++-
 source3/modules/vfs_hpuxacl.c |    7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 1c310c7..4666be2 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -659,8 +659,15 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
 			    uint32 security_info,
 			    struct security_descriptor **ppdesc)
 {
+	int ret;
+
 	/* Get the stat struct for the owner info. */
-	if(SMB_VFS_STAT(conn, smb_fname) != 0) {
+	if (lp_posix_pathnames()) {
+		ret = SMB_VFS_LSTAT(conn, smb_fname);
+	} else {
+		ret = SMB_VFS_STAT(conn, smb_fname);
+	}
+	if (ret == -1) {
 		return 0;
 	}
 
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index df70f1e..5a54f79 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -255,7 +255,12 @@ int hpuxacl_sys_acl_set_file(vfs_handle_struct *handle,
 	 * that has _not_ been specified in "type" from the file first 
 	 * and concatenate it with the acl provided.
 	 */
-	if (SMB_VFS_STAT(handle->conn, smb_fname) != 0) {
+	if (lp_posix_pathnames()) {
+		ret = SMB_VFS_LSTAT(handle->conn, smb_fname);
+	} else {
+		ret = SMB_VFS_STAT(handle->conn, smb_fname);
+	}
+	if (ret != 0) {
 		DEBUG(10, ("Error in stat call: %s\n", strerror(errno)));
 		goto done;
 	}


-- 
Samba Shared Repository


More information about the samba-cvs mailing list