From: Wayne Davison <wayned@samba.org>
Date: Sun, 11 Mar 2007 07:21:07 +0000 (+0000)
Subject: We now compile on systems where ENOTSUP is not defined.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/d4a013edb7a8d018e63fb8102433867bdb95ea9f

We now compile on systems where ENOTSUP is not defined.
---

diff --git a/acls.c b/acls.c
index 36d6ba21..98d4c8f7 100644
--- a/acls.c
+++ b/acls.c
@@ -510,7 +510,7 @@ static int get_rsync_acl(const char *fname, rsync_acl *racl,
 		if (!ok) {
 			return -1;
 		}
-	} else if (errno == ENOTSUP || errno == ENOSYS) {
+	} else if (no_acl_syscall_error(errno)) {
 		/* ACLs are not supported, so pretend we have a basic ACL. */
 		if (type == SMB_ACL_TYPE_ACCESS)
 			rsync_acl_fake_perms(racl, mode);
@@ -1043,7 +1043,9 @@ int default_perms_for_dir(const char *dir)
 	if (sacl == NULL) {
 		/* Couldn't get an ACL.  Darn. */
 		switch (errno) {
+#ifdef ENOTSUP
 		case ENOTSUP:
+#endif
 		case ENOSYS:
 			/* No ACLs are available. */
 			break;
diff --git a/lib/sysacls.h b/lib/sysacls.h
index ce643ada..be986f7c 100644
--- a/lib/sysacls.h
+++ b/lib/sysacls.h
@@ -36,5 +36,6 @@ int sys_acl_delete_def_file(const char *name);
 int sys_acl_free_text(char *text);
 int sys_acl_free_acl(SMB_ACL_T the_acl);
 int sys_acl_free_qualifier(void *qual, SMB_ACL_TAG_T tagtype);
+int no_acl_syscall_error(int err);
 
 #endif /* SUPPORT_ACLS */