[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  c99402724a6 s3-vfs: Use ENOATTR in errno comparison for getxattr
       via  9f666969f8c docs-xml: Fix a typo in manpage for idmap_ad
      from  574fdfae59c CI: run "samba-nt4" as part of the free runners

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


- Log -----------------------------------------------------------------
commit c99402724a65f4e1f8ed4dcd236a43e0603bef0a
Author: Anoop C S <anoopcs at redhat.com>
Date:   Wed Jan 23 15:40:43 2019 +0530

    s3-vfs: Use ENOATTR in errno comparison for getxattr
    
    * ENODATA is not defined in FreeBSD
    * ENOATTR is defined to be a synonym for ENODATA in Linux
    * In its absence Samba already defines ENOATTR to either
      ENODATA or ENOENT
    
    Thus it is safe and correct to compare with ENOATTR rather
    than ENODATA.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Uri Simchoni <uri at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Jan 23 21:59:10 CET 2019 on sn-devel-144

commit 9f666969f8cb39ed95ccd36c1bc50b151d739d1c
Author: SATOH Fumiyasu <fumiyas at osstech.co.jp>
Date:   Wed Jan 23 11:29:51 2019 +0900

    docs-xml: Fix a typo in manpage for idmap_ad
    
    Signed-off-by: SATOH Fumiyasu <fumiyas at osstech.co.jp>
    Reviewed-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Volker Lendecke <vl at samba.org>

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

Summary of changes:
 docs-xml/manpages/idmap_ad.8.xml     | 2 +-
 source3/modules/posixacl_xattr.c     | 4 ++--
 source3/modules/vfs_glusterfs.c      | 2 +-
 source3/modules/vfs_glusterfs_fuse.c | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/docs-xml/manpages/idmap_ad.8.xml b/docs-xml/manpages/idmap_ad.8.xml
index aea6f076461..12cdeb60393 100644
--- a/docs-xml/manpages/idmap_ad.8.xml
+++ b/docs-xml/manpages/idmap_ad.8.xml
@@ -92,7 +92,7 @@
 		<listitem><para>
 		  If set to <parameter>yes</parameter> winbind will retrieve the login
 		  shell and home directory from the LDAP attributes. If set to
-		  <parameter>no</parameter> the or the AD LDAP entry lacks the SFU
+		  <parameter>no</parameter> or the AD LDAP entry lacks the SFU
 		  attributes the options <emphasis>template shell</emphasis> and
 		  <emphasis>template homedir</emphasis> are used.
 		</para>
diff --git a/source3/modules/posixacl_xattr.c b/source3/modules/posixacl_xattr.c
index 8f6f365bff9..6f016e17e0b 100644
--- a/source3/modules/posixacl_xattr.c
+++ b/source3/modules/posixacl_xattr.c
@@ -379,7 +379,7 @@ SMB_ACL_T posixacl_xattr_acl_get_file(vfs_handle_struct *handle,
 	if (ret > 0) {
 		return posixacl_xattr_to_smb_acl(buf, ret, mem_ctx);
 	}
-	if (ret == 0 || errno == ENOATTR || errno == ENODATA) {
+	if (ret == 0 || errno == ENOATTR) {
 		mode_t mode = 0;
 		TALLOC_CTX *frame = talloc_stackframe();
 		struct smb_filename *smb_fname_tmp =
@@ -434,7 +434,7 @@ SMB_ACL_T posixacl_xattr_acl_get_fd(vfs_handle_struct *handle,
 	if (ret > 0) {
 		return posixacl_xattr_to_smb_acl(buf, ret, mem_ctx);
 	}
-	if (ret == 0 || errno == ENOATTR || errno == ENODATA) {
+	if (ret == 0 || errno == ENOATTR) {
 		SMB_STRUCT_STAT sbuf;
 		ret = SMB_VFS_FSTAT(fsp, &sbuf);
 		if (ret == 0)
diff --git a/source3/modules/vfs_glusterfs.c b/source3/modules/vfs_glusterfs.c
index c9d57b4b646..a241ac9db9f 100644
--- a/source3/modules/vfs_glusterfs.c
+++ b/source3/modules/vfs_glusterfs.c
@@ -1443,7 +1443,7 @@ static int vfs_gluster_get_real_filename(struct vfs_handle_struct *handle,
 
 	ret = glfs_getxattr(handle->data, path, key_buf, val_buf, NAME_MAX + 1);
 	if (ret == -1) {
-		if (errno == ENODATA) {
+		if (errno == ENOATTR) {
 			errno = EOPNOTSUPP;
 		}
 		return -1;
diff --git a/source3/modules/vfs_glusterfs_fuse.c b/source3/modules/vfs_glusterfs_fuse.c
index 64c1b0035c1..8855cd18d01 100644
--- a/source3/modules/vfs_glusterfs_fuse.c
+++ b/source3/modules/vfs_glusterfs_fuse.c
@@ -42,7 +42,7 @@ static int vfs_gluster_fuse_get_real_filename(struct vfs_handle_struct *handle,
 
 	ret = getxattr(path, key_buf, val_buf, NAME_MAX + 1);
 	if (ret == -1) {
-		if (errno == ENODATA) {
+		if (errno == ENOATTR) {
 			errno = EOPNOTSUPP;
 		}
 		return -1;


-- 
Samba Shared Repository