[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  5d99835 s3:vfs_gpfs: increase log level for EPERM and EACCES errors in gpfs_get_xattr()
      from  e9cff21 ldbsamba: Move pyldb-utils dependency to python_samba__ldb

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 5d998358e23ea572fa9c695ad953bab8ae49744c
Author: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
Date:   Fri Jan 31 10:31:21 2014 +0100

    s3:vfs_gpfs: increase log level for EPERM and EACCES errors in gpfs_get_xattr()
    
    Signed-off-by: Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
    Reviewed-by: Christof Schmitt <cs at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Thu May 15 02:19:41 CEST 2014 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_gpfs.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c
index a56af8f..5ad2595 100644
--- a/source3/modules/vfs_gpfs.c
+++ b/source3/modules/vfs_gpfs.c
@@ -1468,13 +1468,20 @@ static ssize_t gpfs_get_xattr(struct vfs_handle_struct *handle,  const char *pat
 
         ret = get_gpfs_winattrs(discard_const_p(char, path), &attrs);
         if ( ret == -1){
+		int dbg_lvl;
+
 		if (errno == ENOSYS) {
 			return SMB_VFS_NEXT_GETXATTR(handle, path, name, value,
 						     size);
 		}
 
-                DEBUG(1, ("gpfs_get_xattr: Get GPFS attributes failed: "
-			  "%d (%s)\n", ret, strerror(errno)));
+		if (errno != EPERM && errno != EACCES) {
+			dbg_lvl = 1;
+		} else {
+			dbg_lvl = 5;
+		}
+		DEBUG(dbg_lvl, ("gpfs_get_xattr: Get GPFS attributes failed: "
+			      "%d (%s)\n", ret, strerror(errno)));
                 return -1;
         }
 


-- 
Samba Shared Repository